diff --git a/games/ootw/ootw_c1/graphics/l1rope/Makefile b/games/ootw/ootw_c1/graphics/l1rope/Makefile index 7a1f8b9b..e60003cf 100644 --- a/games/ootw/ootw_c1/graphics/l1rope/Makefile +++ b/games/ootw/ootw_c1/graphics/l1rope/Makefile @@ -1,60 +1,63 @@ -include ../../../Makefile.inc +include ../../../../../Makefile.inc -PNG2RLE = ../../../gr-utils/png2rle -PNG2LZ4 = ../../../gr-utils/png2lz4 +PNG2GR = ../../../../../utils/gr-utils/png2gr +LZSA = ~/research/lzsa/lzsa/lzsa all: ootw_rope.inc ootw_swing.inc ##### -ootw_rope.inc: $(PNG2RLE) another_rope.png another_norope.png - $(PNG2RLE) asm another_rope.png rope_rle > ootw_rope.inc - $(PNG2RLE) asm another_norope.png no_rope_rle >> ootw_rope.inc - $(PNG2RLE) asm another_brokerope.png broke_rope_rle >> ootw_rope.inc - +ootw_rope.inc: another_rope.lzsa another_norope.lzsa another_brokerope.lzsa + echo "rope_lzsa: .incbin \"another_rope.lzsa\"" > ootw_rope.inc + echo "no_rope_lzsa: .incbin \"another_norope.lzsa\"" >> ootw_rope.inc + echo "broke_rope_lzsa: .incbin \"another_brokerope.lzsa\"" >> ootw_rope.inc ##### -ootw_swing.inc: $(PNG2RLE) \ - another_swing01.png another_swing02.png another_swing03.png \ - another_swing04.png another_swing05.png another_swing06.png \ - another_swing08.png \ - another_swing10.png another_swing11.png another_swing12.png \ - another_swing13.png another_swing14.png another_swing15.png \ - another_swing16.png another_swing17.png another_swing18.png \ - another_swing19.png another_swing20.png another_swing21.png \ - another_swing22.png another_swing23.png another_swing24.png \ - another_swing25.png - $(PNG2RLE) asm another_swing01.png swing01_rle > ootw_swing.inc - $(PNG2RLE) asm another_swing02.png swing02_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing03.png swing03_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing04.png swing04_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing05.png swing05_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing06.png swing06_rle >> ootw_swing.inc -# $(PNG2RLE) asm another_swing07.png swing07_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing08.png swing08_rle >> ootw_swing.inc -# $(PNG2RLE) asm another_swing09.png swing09_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing10.png swing10_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing11.png swing11_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing12.png swing12_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing13.png swing13_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing14.png swing14_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing15.png swing15_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing16.png swing16_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing17.png swing17_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing18.png swing18_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing19.png swing19_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing20.png swing20_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing21.png swing21_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing22.png swing22_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing23.png swing23_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing24.png swing24_rle >> ootw_swing.inc - $(PNG2RLE) asm another_swing25.png swing25_rle >> ootw_swing.inc +ootw_swing.inc: \ + another_swing01.lzsa another_swing02.lzsa another_swing03.lzsa \ + another_swing04.lzsa another_swing05.lzsa another_swing06.lzsa \ + another_swing08.lzsa \ + another_swing10.lzsa another_swing11.lzsa another_swing12.lzsa \ + another_swing13.lzsa another_swing14.lzsa another_swing15.lzsa \ + another_swing16.lzsa another_swing17.lzsa another_swing18.lzsa \ + another_swing19.lzsa another_swing20.lzsa another_swing21.lzsa \ + another_swing22.lzsa another_swing23.lzsa another_swing24.lzsa \ + another_swing25.lzsa + echo "swing01_lzsa: .incbin \"another_swing01.lzsa\"" > ootw_swing.inc + echo "swing02_lzsa: .incbin \"another_swing02.lzsa\"" >> ootw_swing.inc + echo "swing03_lzsa: .incbin \"another_swing03.lzsa\"" >> ootw_swing.inc + echo "swing04_lzsa: .incbin \"another_swing04.lzsa\"" >> ootw_swing.inc + echo "swing05_lzsa: .incbin \"another_swing05.lzsa\"" >> ootw_swing.inc + echo "swing06_lzsa: .incbin \"another_swing06.lzsa\"" >> ootw_swing.inc + echo "swing08_lzsa: .incbin \"another_swing08.lzsa\"" >> ootw_swing.inc + echo "swing10_lzsa: .incbin \"another_swing10.lzsa\"" >> ootw_swing.inc + echo "swing11_lzsa: .incbin \"another_swing11.lzsa\"" >> ootw_swing.inc + echo "swing12_lzsa: .incbin \"another_swing12.lzsa\"" >> ootw_swing.inc + echo "swing13_lzsa: .incbin \"another_swing13.lzsa\"" >> ootw_swing.inc + echo "swing14_lzsa: .incbin \"another_swing14.lzsa\"" >> ootw_swing.inc + echo "swing15_lzsa: .incbin \"another_swing15.lzsa\"" >> ootw_swing.inc + echo "swing16_lzsa: .incbin \"another_swing16.lzsa\"" >> ootw_swing.inc + echo "swing17_lzsa: .incbin \"another_swing17.lzsa\"" >> ootw_swing.inc + echo "swing18_lzsa: .incbin \"another_swing18.lzsa\"" >> ootw_swing.inc + echo "swing19_lzsa: .incbin \"another_swing19.lzsa\"" >> ootw_swing.inc + echo "swing20_lzsa: .incbin \"another_swing20.lzsa\"" >> ootw_swing.inc + echo "swing21_lzsa: .incbin \"another_swing21.lzsa\"" >> ootw_swing.inc + echo "swing22_lzsa: .incbin \"another_swing22.lzsa\"" >> ootw_swing.inc + echo "swing23_lzsa: .incbin \"another_swing23.lzsa\"" >> ootw_swing.inc + echo "swing24_lzsa: .incbin \"another_swing24.lzsa\"" >> ootw_swing.inc + echo "swing25_lzsa: .incbin \"another_swing25.lzsa\"" >> ootw_swing.inc +##### +%.gr: %.png + $(PNG2GR) $< $@ + +%.lzsa: %.gr + $(LZSA) -r -f2 $< $@ ##### clean: - rm -f *~ *.o *.lst *.lzz *.inc + rm -f *~ *.o *.lst *.inc *.gr *.lzsa diff --git a/games/ootw/ootw_c1/graphics/l1rope/ootw_rope.inc b/games/ootw/ootw_c1/graphics/l1rope/ootw_rope.inc deleted file mode 100644 index 02dd315b..00000000 --- a/games/ootw/ootw_c1/graphics/l1rope/ootw_rope.inc +++ /dev/null @@ -1,134 +0,0 @@ -rope_rle: .byte $28 ; ysize=48 - .byte $A3,$00, $22,$22, $00, $A4,$22, $A3,$00, $55, $A9,$00 - .byte $22, $A4,$00, $22, $52, $22, $00,$00, $22 - .byte $06, $A5,$66, $A3,$00, $22,$22, $00, $A4,$22, $A3,$00 - .byte $55, $A6,$00, $05, $00, $55, $22, $A5,$00 - .byte $55, $22, $00,$00, $22, $00, $A5,$66, $00,$00 - .byte $55, $22,$22, $00, $A4,$22, $20, $00,$00, $55 - .byte $A6,$00, $55, $00, $55, $22, $A5,$00, $55 - .byte $22, $00,$00, $02, $20, $A4,$66, $26, $00,$00 - .byte $77, $55, $22, $00, $A5,$22, $00,$00, $55 - .byte $A8,$00, $55, $22, $A5,$00, $55, $22, $00,$00 - .byte $20, $22, $06, $A3,$66, $22, $00,$00, $77 - .byte $55, $22, $00, $A5,$22, $AB,$00, $55, $22 - .byte $A5,$00, $55, $22, $00,$00, $22, $00,$00, $55 - .byte $66,$66, $22, $00,$00, $77, $55, $22, $00 - .byte $A4,$22, $A3,$00, $55, $A8,$00, $55, $22, $00,$00 - .byte $55, $22, $00, $55, $22, $00,$00, $02 - .byte $00,$00, $55, $66,$66, $22, $00,$00, $77, $55 - .byte $22, $00, $A4,$22, $20, $00,$00, $55, $A8,$00 - .byte $55, $22, $00,$00, $55, $22, $00, $55 - .byte $22, $A5,$00, $55, $26, $66, $22, $00,$00 - .byte $77, $55, $22,$22, $00, $A4,$22, $A9,$00, $50 - .byte $00, $55, $22, $00,$00, $55, $22, $00 - .byte $55, $22, $A5,$00, $55, $22, $26, $22 - .byte $A3,$00, $55, $22,$22, $00, $A4,$22, $A9,$00, $55 - .byte $00, $55, $22, $00,$00, $25, $22, $00 - .byte $05, $22, $A5,$00, $55, $02, $00, $22 - .byte $A3,$00, $77, $55, $22, $00, $A4,$22, $AB,$00 - .byte $55, $22, $00,$00, $22, $A3,$00, $22, $A5,$00 - .byte $55, $00,$00, $22, $A4,$00, $55, $22,$22, $00 - .byte $22,$22, $02, $05, $AA,$00, $55, $22, $00,$00 - .byte $22, $A3,$00, $22,$22, $A5,$00, $55, $22,$22, $A4,$00 - .byte $55, $22,$22, $20, $02, $20, $22, $AB,$00 - .byte $05, $22, $00,$00, $22, $A3,$00, $02, $22 - .byte $A5,$00, $55, $22,$22, $A4,$00, $A7,$22, $AC,$00, $22 - .byte $00,$00, $02, $A4,$00, $22, $A5,$00, $55, $02,$02 - .byte $A4,$00, $A6,$22, $02, $22, $00, $70,$70, $A8,$00 - .byte $22, $A7,$00, $22, $A5,$00, $55, $A6,$00, $A6,$22 - .byte $20, $52, $A4,$55, $50,$50, $A5,$00, $22, $A7,$00 - .byte $22, $AC,$00, $02, $52, $72, $52, $A3,$22 - .byte $A5,$00, $A3,$05, $55, $A3,$50, $22, $A0,$15,$00, $20,$20 - .byte $A3,$22, $00, $22, $20, $A8,$00, $05, $55,$55 - .byte $50, $A0,$13,$00, $A6,$22, $20, $22,$22, $AB,$00, $05 - .byte $55,$55, $AD,$50, $A4,$00, $A9,$22, $20, $AC,$00, $05,$05 - .byte $AC,$55, $A4,$00, $AA,$22, $AF,$00, $05, $A6,$55, $A4,$05 - .byte $A4,$00, $AA,$22, $A0,$92,$00 - .byte $A1 -no_rope_rle: .byte $28 ; ysize=48 - .byte $A3,$00, $A7,$22, $A3,$00, $55, $A9,$00, $22, $A4,$00 - .byte $22, $52, $22, $00,$00, $22, $06, $A5,$66 - .byte $A3,$00, $A7,$22, $A3,$00, $55, $A6,$00, $05, $00 - .byte $55, $22, $A5,$00, $55, $22, $00,$00, $22 - .byte $00, $A5,$66, $00,$00, $55, $A7,$22, $20, $00,$00 - .byte $55, $A6,$00, $55, $00, $55, $22, $A5,$00 - .byte $55, $22, $00,$00, $02, $20, $A4,$66, $26 - .byte $00,$00, $77, $55, $A7,$22, $00,$00, $55, $A8,$00 - .byte $55, $22, $A5,$00, $55, $22, $00,$00, $20 - .byte $22, $06, $A3,$66, $22, $00,$00, $77, $55 - .byte $A7,$22, $AB,$00, $55, $22, $A5,$00, $55, $22 - .byte $00,$00, $22, $00,$00, $55, $66,$66, $22, $00,$00 - .byte $77, $55, $A6,$22, $A3,$00, $55, $A8,$00, $55 - .byte $22, $00,$00, $55, $22, $00, $55, $22 - .byte $00,$00, $02, $00,$00, $55, $66,$66, $22, $00,$00 - .byte $77, $55, $A6,$22, $20, $00,$00, $55, $A8,$00 - .byte $55, $22, $00,$00, $55, $22, $00, $55 - .byte $22, $A5,$00, $55, $26, $66, $22, $00,$00 - .byte $77, $55, $A7,$22, $A9,$00, $50, $00, $55 - .byte $22, $00,$00, $55, $22, $00, $55, $22 - .byte $A5,$00, $55, $22, $26, $22, $A3,$00, $55 - .byte $A7,$22, $A9,$00, $55, $00, $55, $22, $00,$00 - .byte $25, $22, $00, $05, $22, $A5,$00, $55 - .byte $02, $00, $22, $A3,$00, $77, $55, $A6,$22 - .byte $AB,$00, $55, $22, $00,$00, $22, $A3,$00, $22 - .byte $A5,$00, $55, $00,$00, $22, $A4,$00, $55, $A6,$22 - .byte $05, $AA,$00, $55, $22, $00,$00, $22, $A3,$00 - .byte $22,$22, $A5,$00, $55, $22,$22, $A4,$00, $55, $A6,$22 - .byte $AB,$00, $05, $22, $00,$00, $22, $A3,$00, $02 - .byte $22, $A5,$00, $55, $22,$22, $A4,$00, $A7,$22, $AC,$00 - .byte $22, $00,$00, $02, $A4,$00, $22, $A5,$00, $55 - .byte $02,$02, $A4,$00, $A6,$22, $02, $22, $00, $70,$70 - .byte $A8,$00, $22, $A7,$00, $22, $A5,$00, $55, $A6,$00 - .byte $A6,$22, $20, $52, $A4,$55, $50,$50, $A5,$00, $22 - .byte $A7,$00, $22, $AC,$00, $02, $52, $72, $52 - .byte $A3,$22, $A5,$00, $A3,$05, $55, $A3,$50, $22, $A0,$15,$00 - .byte $20,$20, $A3,$22, $00, $22, $20, $A8,$00, $05 - .byte $55,$55, $50, $A0,$13,$00, $A6,$22, $20, $22,$22, $AB,$00 - .byte $05, $55,$55, $AD,$50, $A4,$00, $A9,$22, $20, $AC,$00 - .byte $05,$05, $AC,$55, $A4,$00, $AA,$22, $AF,$00, $05, $A6,$55 - .byte $A4,$05, $A4,$00, $AA,$22, $A0,$92,$00 - .byte $A1 -broke_rope_rle: .byte $28 ; ysize=48 - .byte $A3,$00, $22,$22, $00, $A4,$22, $A3,$00, $55, $A9,$00 - .byte $22, $A4,$00, $22, $52, $22, $00,$00, $22 - .byte $06, $A5,$66, $A3,$00, $22,$22, $00, $A4,$22, $A3,$00 - .byte $55, $A6,$00, $05, $00, $55, $22, $A5,$00 - .byte $55, $22, $00,$00, $22, $00, $A5,$66, $00,$00 - .byte $55, $22,$22, $00, $A4,$22, $20, $00,$00, $55 - .byte $A6,$00, $55, $00, $55, $22, $A5,$00, $55 - .byte $22, $00,$00, $02, $20, $A4,$66, $26, $00,$00 - .byte $77, $55, $02, $00, $A5,$22, $00,$00, $55 - .byte $A8,$00, $55, $22, $A5,$00, $55, $22, $00,$00 - .byte $20, $22, $06, $A3,$66, $22, $00,$00, $77 - .byte $55, $00, $A6,$22, $AB,$00, $55, $22, $A5,$00 - .byte $55, $22, $00,$00, $22, $00,$00, $55, $66,$66 - .byte $22, $00,$00, $77, $55, $20, $A5,$22, $A3,$00 - .byte $55, $A8,$00, $55, $22, $00,$00, $55, $22 - .byte $00, $55, $22, $00,$00, $02, $00,$00, $55 - .byte $66,$66, $22, $00,$00, $77, $55, $A6,$22, $20 - .byte $00,$00, $55, $A8,$00, $55, $22, $00,$00, $55 - .byte $22, $00, $55, $22, $A5,$00, $55, $26 - .byte $66, $22, $00,$00, $77, $55, $A7,$22, $A9,$00 - .byte $50, $00, $55, $22, $00,$00, $55, $22 - .byte $00, $55, $22, $A5,$00, $55, $22, $26 - .byte $22, $A3,$00, $55, $A7,$22, $A9,$00, $55, $00 - .byte $55, $22, $00,$00, $25, $22, $00, $05 - .byte $22, $A5,$00, $55, $02, $00, $22, $A3,$00 - .byte $77, $55, $A6,$22, $AB,$00, $55, $22, $00,$00 - .byte $22, $A3,$00, $22, $A5,$00, $55, $00,$00, $22 - .byte $A4,$00, $55, $A6,$22, $05, $AA,$00, $55, $22 - .byte $00,$00, $22, $A3,$00, $22,$22, $A5,$00, $55, $22,$22 - .byte $A4,$00, $55, $A6,$22, $AB,$00, $05, $22, $00,$00 - .byte $22, $A3,$00, $02, $22, $A5,$00, $55, $22,$22 - .byte $A4,$00, $A7,$22, $AC,$00, $22, $00,$00, $02, $A4,$00 - .byte $22, $A5,$00, $55, $02,$02, $A4,$00, $A6,$22, $02 - .byte $22, $00, $70,$70, $A8,$00, $22, $A7,$00, $22 - .byte $A5,$00, $55, $A6,$00, $A6,$22, $20, $52, $A4,$55 - .byte $50,$50, $A5,$00, $22, $A7,$00, $22, $AC,$00, $02 - .byte $52, $72, $52, $A3,$22, $A5,$00, $A3,$05, $55 - .byte $A3,$50, $22, $A0,$15,$00, $20,$20, $A3,$22, $00, $22 - .byte $20, $A8,$00, $05, $55,$55, $50, $A0,$13,$00, $A6,$22 - .byte $20, $22,$22, $AB,$00, $05, $55,$55, $AD,$50, $A4,$00 - .byte $A9,$22, $20, $AC,$00, $05,$05, $AC,$55, $A4,$00, $AA,$22 - .byte $AF,$00, $05, $A6,$55, $A4,$05, $A4,$00, $AA,$22, $A0,$92,$00 - .byte $A1 diff --git a/games/ootw/ootw_c1/graphics/l1rope/ootw_swing.inc b/games/ootw/ootw_c1/graphics/l1rope/ootw_swing.inc deleted file mode 100644 index 708bc46a..00000000 --- a/games/ootw/ootw_c1/graphics/l1rope/ootw_swing.inc +++ /dev/null @@ -1,191 +0,0 @@ -swing01_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A5,$AA, $9A,$9A, $A0,$21,$AA, $00, $A4,$AA, $BB, $99 - .byte $A0,$21,$AA, $00, $A5,$AA, $0B, $A0,$21,$AA, $00, $A0,$02,$AA - .byte $A3,$AB, $00, $A0,$22,$AA, $00, $A0,$02,$AA, $0A,$0A, $40 - .byte $A0,$22,$AA, $A0,$01,$A0, $0A, $A0,$01,$A0, $A0,$02,$AA, $44, $A0,$27,$AA - .byte $44, $A0,$26,$AA, $A0,$02,$AF, $A0,$FF,$AA, $A0,$AC,$AA - .byte $A1 -swing02_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A4,$AA, $9A,$9A, $A0,$22,$AA, $00, $A0,$01,$AA, $BA, $A0,$01,$AB - .byte $B9, $99, $A0,$22,$AA, $00, $A0,$01,$AA, $A0,$01,$AB, $BA - .byte $0A, $00, $A0,$22,$AA, $00, $A4,$AA, $00, $A0,$23,$AA - .byte $00, $A0,$02,$AA, $0A, $40, $A0,$23,$AA, $A0,$01,$A0, $0A - .byte $A0,$01,$A0, $A0,$01,$AA, $44, $A0,$26,$AA, $FA, $F4, $A0,$FF,$AA - .byte $A0,$D5,$AA - .byte $A1 -swing03_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$02,$AA, $9A,$9A, $A0,$24,$AA, $00, $A0,$01,$AB, $99,$99, $A0,$24,$AA - .byte $00, $A0,$01,$AB, $BA, $00, $A0,$24,$AA, $00, $A0,$02,$AA - .byte $00, $A0,$25,$AA, $00, $A0,$01,$AA, $44, $0A, $A0,$24,$AA - .byte $A0,$01,$A0, $44, $CC, $A0,$25,$AA, $FA, $F4, $A0,$FF,$AA - .byte $A0,$D8,$AA - .byte $A1 -swing04_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$28,$AA, $00, $99,$99, $A0,$25,$AA, $B0, $A0,$01,$A9, $B9 - .byte $A0,$25,$AA, $0B, $A0,$01,$AB, $B0, $A0,$26,$AA, $00,$00, $A3,$0A - .byte $A0,$23,$AA, $A0,$01,$A0, $00, $A0,$27,$AA, $44, $CA, $A0,$25,$AA - .byte $44, $A0,$01,$A4, $CC, $A0,$24,$AA, $FA, $F4, $A0,$02,$A5 - .byte $A0,$FF,$AA, $A0,$87,$AA - .byte $A1 -swing05_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$28,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $B0, $A0,$27,$AA - .byte $BB, $90, $A0,$02,$AA, $0A, $A0,$23,$AA, $BB, $99 - .byte $0A, $A0,$01,$A0, $A0,$25,$AA, $00, $A0,$26,$AA, $4A, $C4 - .byte $A0,$25,$AA, $44, $A0,$01,$A4, $A0,$01,$AC, $7A, $A0,$24,$AA, $A0,$01,$AF - .byte $A0,$FF,$AA, $A0,$63,$AA - .byte $A1 -swing06_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$28,$AA, $00, $A0,$26,$AA - .byte $9A,$9A, $BB, $A0,$25,$AA, $99, $BB, $A0,$01,$A0, $A3,$0A - .byte $A0,$22,$AA, $0A, $00, $A0,$25,$AA, $44, $A0,$01,$A4, $C4 - .byte $A0,$25,$AA, $F4, $A0,$01,$AA, $5C, $A0,$FF,$AA, $A0,$8A,$AA - .byte $A1 -swing08_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $BA - .byte $A0,$27,$AA, $BB, $9A, $A0,$26,$AA, $BB, $09, $A3,$0A - .byte $A0,$24,$AA, $00, $A0,$26,$AA, $44, $C4, $A0,$26,$AA, $F4 - .byte $A0,$01,$AC, $7A, $A0,$FF,$AA, $A0,$88,$AA - .byte $A1 -swing10_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$28,$AA, $0A - .byte $A0,$26,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $BA - .byte $A0,$27,$AA, $BB, $9A, $A0,$26,$AA, $BB, $09, $A3,$0A - .byte $A0,$24,$AA, $00, $A0,$26,$AA, $44, $C4, $A0,$26,$AA, $F4 - .byte $A0,$01,$AC, $7A, $A0,$FF,$AA, $A0,$88,$AA - .byte $A1 -swing11_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$28,$AA, $A0,$01,$A0, $A0,$4F,$AA, $0A - .byte $A0,$28,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $B0, $A0,$27,$AA - .byte $BB, $9A, $A0,$01,$AA, $0A, $A0,$24,$AA, $BB, $09 - .byte $0A, $A0,$01,$A0, $A0,$25,$AA, $00, $A0,$26,$AA, $44, $C4 - .byte $A0,$26,$AA, $F4, $A0,$01,$AC, $7A, $A0,$FF,$AA, $A0,$5F,$AA - .byte $A1 -swing12_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$C9,$AA - .byte $A0,$01,$A0, $0A, $A0,$27,$AA, $00, $A0,$02,$AA, $0A, $A0,$24,$AA - .byte $A0,$01,$A0, $B0, $A0,$01,$AB, $A0,$01,$A0, $A0,$25,$AA, $BB, $99 - .byte $A0,$26,$AA, $A0,$01,$AB, $00, $A0,$26,$AA, $4A, $40, $A0,$26,$AA - .byte $44, $CC, $A0,$26,$AA, $A0,$01,$AF, $A0,$01,$AA, $A0,$01,$A5, $A0,$FF,$AA - .byte $AE,$AA - .byte $A1 -swing13_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$CA,$AA - .byte $0A, $A0,$28,$AA, $00, $A0,$27,$AA, $00, $0A, $BA - .byte $A0,$26,$AA, $BB, $9A, $A0,$26,$AA, $BB, $09, $A0,$27,$AA - .byte $00, $A0,$26,$AA, $44, $C4, $A0,$26,$AA, $F4, $5C - .byte $A0,$FF,$AA, $AE,$AA - .byte $A1 -swing14_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$1D,$AA, $0A, $A0,$27,$AA, $00, $0A, $A0,$26,$AA, $A0,$02,$A0 - .byte $A0,$51,$AA, $00, $A0,$26,$AA, $44, $C4, $A0,$26,$AA, $F4 - .byte $A0,$01,$AC, $7A, $A0,$E2,$AA - .byte $A1 -swing15_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$E9,$AA, $00, $A0,$26,$AA, $4A, $40, $A0,$26,$AA, $44 - .byte $CC, $A0,$26,$AA, $A0,$01,$AF, $A0,$01,$AA, $A0,$01,$A7, $A0,$91,$AA - .byte $A1 -swing16_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$E9,$AA, $0A,$0A, $A0,$26,$AA, $40,$40, $A0,$26,$AA, $44, $A0,$01,$AC - .byte $5A, $A0,$25,$AA, $A0,$01,$AF, $A0,$92,$AA - .byte $A1 -swing17_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$FF,$AA, $A0,$3C,$AA, $44, $A0,$01,$AC, $7A, $A0,$25,$AA, $A0,$01,$AF - .byte $A0,$90,$AA - .byte $A1 -swing18_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$FF,$AA, $A0,$68,$AA, $F4, $5A, $A0,$8B,$AA - .byte $A1 -swing19_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$26,$AA - .byte $0A, $00, $A0,$26,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $A0,$FF,$AA - .byte $A0,$A3,$AA, $BB, $A0,$FF,$AA, $A0,$51,$AA - .byte $A1 -swing20_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$10,$AA, $00, $A0,$16,$AA, $00, $A0,$10,$AA - .byte $A0,$01,$A0, $0A, $A0,$15,$AA, $00, $A0,$11,$AA, $00, $A0,$14,$AA - .byte $0A, $00, $A0,$11,$AA, $00, $A0,$14,$AA, $00, $A0,$12,$AA - .byte $00, $A0,$14,$AA, $A0,$01,$A0, $A0,$12,$AA, $A0,$01,$A0, $0A, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$28,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $A0,$01,$A0, $BA, $A0,$27,$AA, $BB, $A0,$27,$AA - .byte $99, $A0,$FF,$AA, $A0,$26,$AA - .byte $A1 -swing21_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$12,$AA, $00, $A0,$14,$AA, $00, $A0,$13,$AA - .byte $00, $A0,$13,$AA, $00, $A0,$13,$AA, $00, $A0,$12,$AA, $0A - .byte $00, $A0,$14,$AA, $00, $A0,$11,$AA, $00, $A0,$15,$AA, $00 - .byte $A0,$11,$AA, $A0,$01,$A0, $A0,$15,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $0A - .byte $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$28,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$27,$AA, $00, $A0,$27,$AA, $A0,$01,$A0 - .byte $BA, $A0,$27,$AA, $BB, $A0,$27,$AA, $99, $BB, $A0,$26,$AA - .byte $00, $A0,$27,$AA, $A0,$01,$A4, $A0,$FA,$AA - .byte $A1 -swing22_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$13,$AA, $00, $A0,$13,$AA, $00, $A0,$14,$AA - .byte $00, $A0,$12,$AA, $00, $A0,$14,$AA, $00, $A0,$11,$AA, $0A - .byte $00, $A0,$15,$AA, $00, $A0,$10,$AA, $00, $A0,$16,$AA, $00 - .byte $A0,$10,$AA, $A0,$01,$A0, $A0,$17,$AA, $00, $A0,$27,$AA, $00, $A0,$28,$AA - .byte $00, $A0,$27,$AA, $00, $A0,$28,$AA, $00, $A0,$27,$AA, $00 - .byte $A0,$28,$AA, $00, $A0,$27,$AA, $A0,$01,$A0, $BA, $A0,$27,$AA, $BB - .byte $A0,$27,$AA, $99, $BB, $A0,$26,$AA, $00,$00, $A0,$26,$AA, $C4 - .byte $44, $A0,$25,$AA, $A0,$01,$A7, $A0,$01,$AA, $A0,$01,$AF, $A0,$F6,$AA - .byte $A1 -swing23_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$15,$AA, $00, $A0,$11,$AA, $00, $A0,$15,$AA - .byte $A0,$01,$A0, $0A, $A0,$10,$AA, $00, $A0,$16,$AA, $00, $AF,$AA - .byte $0A, $00, $A0,$16,$AA, $A0,$01,$A0, $0A, $AE,$AA, $00 - .byte $A0,$18,$AA, $00, $AE,$AA, $A0,$01,$A0, $A0,$19,$AA, $00, $A0,$27,$AA - .byte $A0,$01,$A0, $0A, $A0,$27,$AA, $A0,$01,$A0, $0A, $A0,$27,$AA, $00 - .byte $A0,$27,$AA, $A0,$01,$A0, $0A, $A0,$27,$AA, $00, $A0,$27,$AA, $A0,$01,$A0 - .byte $BA, $A0,$27,$AA, $BB, $A0,$27,$AA, $99, $BB, $A0,$26,$AA - .byte $00, $A0,$27,$AA, $44, $A0,$26,$AA, $7A, $A0,$01,$AC, $F4 - .byte $A0,$FF,$AA, $A0,$1D,$AA - .byte $A1 -swing24_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$18,$AA, $00, $AE,$AA, $00, $A0,$18,$AA - .byte $A0,$01,$A0, $0A, $AD,$AA, $00, $A0,$19,$AA, $00, $AC,$AA - .byte $0A, $00, $A0,$1A,$AA, $00, $AB,$AA, $00, $A0,$1B,$AA - .byte $A0,$01,$A0, $0A, $AA,$AA, $A0,$01,$A0, $A0,$1C,$AA, $00, $A0,$28,$AA - .byte $00, $A0,$27,$AA, $A0,$01,$A0, $0A, $A0,$27,$AA, $00, $A0,$28,$AA - .byte $00, $A0,$28,$AA, $00, $A0,$28,$AA, $BB, $A0,$27,$AA, $9B - .byte $BA, $A0,$26,$AA, $09, $0B, $A0,$26,$AA, $40, $00 - .byte $A0,$25,$AA, $7A, $A0,$01,$AC, $44, $A0,$27,$AA, $A0,$01,$AF, $A0,$FF,$AA - .byte $A0,$19,$AA - .byte $A1 -swing25_rle: .byte $28 ; ysize=48 - .byte $A5,$AA, $00, $A0,$19,$AA, $00, $AD,$AA, $00, $A0,$19,$AA - .byte $A0,$01,$A0, $0A, $AC,$AA, $00, $A0,$1A,$AA, $00, $AB,$AA - .byte $0A, $00, $A0,$1B,$AA, $00, $AA,$AA, $00, $A0,$1C,$AA - .byte $A0,$01,$A0, $0A, $A9,$AA, $A0,$01,$A0, $A0,$1D,$AA, $00, $A0,$28,$AA - .byte $00, $A0,$28,$AA, $00, $A0,$28,$AA, $00, $A0,$28,$AA, $00 - .byte $A0,$28,$AA, $BB, $A0,$27,$AA, $9B, $A0,$27,$AA, $09, $A0,$27,$AA - .byte $00, $A0,$27,$AA, $C4, $A0,$27,$AA, $A0,$01,$A7, $A0,$FF,$AA, $A0,$41,$AA - .byte $A1 diff --git a/games/ootw/ootw_c1/ootw_c1_rope.s b/games/ootw/ootw_c1/ootw_c1_rope.s index 94579968..4f0c0813 100644 --- a/games/ootw/ootw_c1/ootw_c1_rope.s +++ b/games/ootw/ootw_c1/ootw_c1_rope.s @@ -37,21 +37,21 @@ ootw_rope: beq after_swing_bg before_swing_bg: - lda #>(rope_rle) - sta GBASH - lda #<(rope_rle) - sta GBASL + lda #<(rope_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(rope_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI jmp load_swing_bg after_swing_bg: - lda #>(broke_rope_rle) - sta GBASH - lda #<(broke_rope_rle) - sta GBASL + lda #<(broke_rope_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(broke_rope_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI load_swing_bg: lda #$c ; load image off-screen $c00 - jsr load_rle_gr + jsr decompress_lzsa2_fast ;================================ ; Load quake background to $BC00 @@ -94,12 +94,13 @@ rope_loop: cmp #80 ; only load background on first frame bne swing_not_first - lda #no_rope_rle - sta GBASH + lda #no_rope_lzsa + sta getsrc_smc+2 ; LZSA_SRC_HI + lda #$C ; load image off-screen $C00 - jsr load_rle_gr + jsr decompress_lzsa2_fast swing_not_first: dec SWING_PROGRESS @@ -107,11 +108,11 @@ swing_not_first: ldx SWING_PROGRESS lda swing_progression,X - sta GBASL + sta getsrc_smc+1 ; LZSA_SRC_LO lda swing_progression+1,X - sta GBASH + sta getsrc_smc+2 ; LZSA_SRC_HI lda #$10 ; load image off-screen $1000 - jsr load_rle_gr + jsr decompress_lzsa2_fast jsr gr_overlay_40x40 @@ -382,44 +383,44 @@ done_rope: swing_progression: -.word swing25_rle -.word swing24_rle -.word swing23_rle -.word swing22_rle -.word swing21_rle -.word swing20_rle -.word swing19_rle -.word swing18_rle -.word swing17_rle -.word swing16_rle -.word swing15_rle -.word swing14_rle -.word swing13_rle -.word swing12_rle -.word swing11_rle -.word swing10_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing08_rle -.word swing06_rle -.word swing05_rle -.word swing04_rle -.word swing03_rle -.word swing02_rle -.word swing01_rle +.word swing25_lzsa +.word swing24_lzsa +.word swing23_lzsa +.word swing22_lzsa +.word swing21_lzsa +.word swing20_lzsa +.word swing19_lzsa +.word swing18_lzsa +.word swing17_lzsa +.word swing16_lzsa +.word swing15_lzsa +.word swing14_lzsa +.word swing13_lzsa +.word swing12_lzsa +.word swing11_lzsa +.word swing10_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing08_lzsa +.word swing06_lzsa +.word swing05_lzsa +.word swing04_lzsa +.word swing03_lzsa +.word swing02_lzsa +.word swing01_lzsa