diff --git a/games/ootw/ootw_c1/NOTES b/games/ootw/ootw_c1/NOTES index 211ec018..2ec6b46c 100644 --- a/games/ootw/ootw_c1/NOTES +++ b/games/ootw/ootw_c1/NOTES @@ -4,4 +4,4 @@ 26274 -- convert ropes 26200 -- convert pool 24568 -- convert end animation - +24200 -- convert beast ending diff --git a/games/ootw/ootw_c1/graphics/l1_beast_end/Makefile b/games/ootw/ootw_c1/graphics/l1_beast_end/Makefile index d02e1aa7..e8737584 100644 --- a/games/ootw/ootw_c1/graphics/l1_beast_end/Makefile +++ b/games/ootw/ootw_c1/graphics/l1_beast_end/Makefile @@ -1,39 +1,45 @@ -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_beast_end.inc ##### -ootw_beast_end.inc: $(PNG2RLE) \ - beast_bg.png \ - beast_slash07.png beast_slash08.png beast_slash09.png \ - beast_slash10.png beast_slash11.png beast_slash12.png \ - beast_slash13.png beast_slash14.png beast_slash15.png \ - beast_slash16.png beast_slash17.png beast_slash18.png \ - beast_slash19.png beast_slash20.png - $(PNG2RLE) asm beast_bg.png beast_bg_rle > ootw_beast_end.inc - $(PNG2RLE) asm beast_slash07.png beast_slash07_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash08.png beast_slash08_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash09.png beast_slash09_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash10.png beast_slash10_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash11.png beast_slash11_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash12.png beast_slash12_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash13.png beast_slash13_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash14.png beast_slash14_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash15.png beast_slash15_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash16.png beast_slash16_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash17.png beast_slash17_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash18.png beast_slash18_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash19.png beast_slash19_rle >> ootw_beast_end.inc - $(PNG2RLE) asm beast_slash20.png beast_slash20_rle >> ootw_beast_end.inc +ootw_beast_end.inc: \ + beast_bg.lzsa \ + beast_slash07.lzsa beast_slash08.lzsa beast_slash09.lzsa \ + beast_slash10.lzsa beast_slash11.lzsa beast_slash12.lzsa \ + beast_slash13.lzsa beast_slash14.lzsa beast_slash15.lzsa \ + beast_slash16.lzsa beast_slash17.lzsa beast_slash18.lzsa \ + beast_slash19.lzsa beast_slash20.lzsa + echo "beast_bg_lzsa: .incbin \"beast_bg.lzsa\"" > ootw_beast_end.inc + echo "beast_slash07_lzsa: .incbin \"beast_slash07.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash08_lzsa: .incbin \"beast_slash08.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash09_lzsa: .incbin \"beast_slash09.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash10_lzsa: .incbin \"beast_slash10.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash11_lzsa: .incbin \"beast_slash11.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash12_lzsa: .incbin \"beast_slash12.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash13_lzsa: .incbin \"beast_slash13.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash14_lzsa: .incbin \"beast_slash14.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash15_lzsa: .incbin \"beast_slash15.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash16_lzsa: .incbin \"beast_slash16.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash17_lzsa: .incbin \"beast_slash17.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash18_lzsa: .incbin \"beast_slash18.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash19_lzsa: .incbin \"beast_slash19.lzsa\"" >> ootw_beast_end.inc + echo "beast_slash20_lzsa: .incbin \"beast_slash20.lzsa\"" >> ootw_beast_end.inc +##### +%.gr: %.png + $(PNG2GR) $< $@ + +%.lzsa: %.gr + $(LZSA) -r -f2 $< $@ ##### clean: - rm -f *~ *.o *.lst *.lzz ootw_beast_end.inc + rm -f *~ *.o *.lst *.lzsa *.gr *.inc diff --git a/games/ootw/ootw_c1/graphics/l1_beast_end/ootw_beast_end.inc b/games/ootw/ootw_c1/graphics/l1_beast_end/ootw_beast_end.inc deleted file mode 100644 index 29f8825d..00000000 --- a/games/ootw/ootw_c1/graphics/l1_beast_end/ootw_beast_end.inc +++ /dev/null @@ -1,164 +0,0 @@ -beast_bg_rle: .byte $28 ; ysize=48 - .byte $A4,$77, $27, $22, $52,$52, $A0,$15,$66, $88, $A3,$55 - .byte $52, $22, $A3,$27, $A3,$77, $27,$27, $22,$22, $55,$55 - .byte $65, $A0,$15,$66, $88,$88, $A3,$55, $A5,$22, $77,$77, $A4,$22 - .byte $55,$55, $A0,$16,$66, $68, $88, $A3,$55, $A5,$22, $77 - .byte $27, $A3,$22, $55,$55, $65, $A0,$17,$66, $68, $85 - .byte $55,$55, $52, $A4,$22, $77, $A4,$22, $55,$55, $A0,$17,$66 - .byte $88, $66, $88, $A3,$55, $A4,$22, $77, $A4,$22 - .byte $55,$55, $A0,$17,$66, $68, $88, $66, $88, $55,$55 - .byte $A4,$22, $77, $A3,$22, $52, $55, $88, $A0,$18,$66 - .byte $88, $86, $68, $88, $55, $A4,$22, $27 - .byte $A3,$22, $55,$55, $88, $A0,$19,$66, $88, $66, $88 - .byte $55, $A8,$22, $55,$55, $88, $A0,$19,$66, $68, $86 - .byte $68, $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88 - .byte $66, $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88 - .byte $66, $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88 - .byte $66, $55,$55, $A7,$22, $55,$55, $88,$88, $86, $A0,$17,$66 - .byte $86, $88, $86, $55,$55, $A7,$22, $A3,$55, $88,$88 - .byte $86, $A0,$15,$66, $86, $88, $66, $88, $55,$55 - .byte $A7,$22, $25, $A3,$55, $A3,$88, $86, $A0,$12,$66, $A3,$88 - .byte $66, $88, $55, $A9,$22, $A3,$55, $28, $A4,$88 - .byte $AF,$66, $86, $A4,$88, $86, $55,$55, $AA,$22, $55,$55 - .byte $22, $58, $A4,$88, $86, $AC,$66, $A7,$88, $55 - .byte $AB,$22, $25, $55, $22, $55,$55, $58, $A4,$88 - .byte $A9,$86, $88,$88, $28, $A4,$58, $A3,$55, $AB,$22, $72 - .byte $25, $22, $A4,$55, $AB,$58, $A3,$55, $22, $A5,$55 - .byte $25, $A4,$22, $72,$72, $77, $A5,$22, $77, $A3,$22 - .byte $AB,$55, $A5,$25, $AC,$22, $A3,$77, $A3,$22, $72, $A3,$77 - .byte $A3,$22, $A5,$25, $72, $A0,$13,$22, $72, $A4,$77, $72,$72 - .byte $A5,$77, $A8,$72, $77, $A0,$12,$72, $A0,$56,$77 - .byte $A1 -beast_slash07_rle: .byte $28 ; ysize=48 - .byte $A0,$FF,$AA, $A0,$CB,$AA, $A4,$00, $A0,$23,$AA, $0A, $A5,$00, $A0,$21,$AA - .byte $0A, $A6,$00, $0A, $A0,$1F,$AA, $0A, $A3,$00, $10 - .byte $A4,$00, $0A, $A0,$1D,$AA, $0A, $00, $A0,$02,$A0, $A3,$00 - .byte $01, $A3,$00, $0A, $A0,$1B,$AA, $0A, $00, $A0,$01,$A0 - .byte $A0,$02,$AA, $A4,$00, $A0,$01,$A0, $A0,$01,$AA, $A0,$01,$A0, $00,$00, $A0,$1A,$AA - .byte $A0,$02,$A0, $A4,$AA, $A3,$00, $A3,$AA, $A0,$02,$A0, $A0,$20,$AA, $A3,$00 - .byte $A0,$25,$AA, $A3,$A0, $A0,$B2,$AA - .byte $A1 -beast_slash08_rle: .byte $28 ; ysize=48 - .byte $A0,$FF,$AA, $A0,$2A,$AA, $A5,$0A, $A0,$22,$AA, $A7,$00, $A0,$20,$AA, $0A - .byte $A7,$00, $0A, $A0,$1D,$AA, $0A, $AB,$00, $A0,$1B,$AA, $0A - .byte $AE,$00, $A0,$18,$AA, $0A, $A0,$10,$00, $A0,$16,$AA, $0A, $00,$00 - .byte $A0,$01,$A0, $A0,$02,$AA, $A7,$00, $A0,$01,$A0, $A0,$01,$AA, $A0,$01,$A0, $A3,$00 - .byte $0A, $A0,$14,$AA, $00,$00, $A0,$01,$A0, $A4,$AA, $A5,$00, $A0,$01,$A0 - .byte $A4,$AA, $A0,$01,$A0, $00,$00, $A0,$1C,$AA, $A4,$00, $A0,$24,$AA, $A4,$A0 - .byte $A0,$FF,$AA, $A0,$2B,$AA - .byte $A1 -beast_slash09_rle: .byte $28 ; ysize=48 - .byte $A0,$B1,$AA, $A6,$0A, $A0,$21,$AA, $A8,$00, $A0,$1F,$AA, $0A, $A8,$00 - .byte $0A, $A0,$1D,$AA, $AB,$00, $0A, $A0,$1A,$AA, $0A, $AE,$00 - .byte $A0,$18,$AA, $0A, $A0,$10,$00, $0A, $A0,$15,$AA, $0A, $A0,$12,$00 - .byte $0A, $A0,$13,$AA, $0A, $A4,$00, $A0,$01,$A0, $A0,$10,$00, $A0,$11,$AA - .byte $A4,$00, $A0,$01,$A0, $A3,$AA, $A8,$00, $A0,$01,$A0, $A0,$02,$AA, $A0,$02,$A0 - .byte $A4,$00, $AF,$AA, $00,$00, $A0,$02,$A0, $A5,$AA, $A0,$01,$A0, $A5,$00 - .byte $A0,$01,$A0, $A5,$AA, $A0,$02,$A0, $00,$00, $A0,$19,$AA, $A4,$00, $A0,$26,$AA - .byte $A0,$02,$A0, $A0,$FF,$AA, $A0,$53,$AA - .byte $A1 -beast_slash10_rle: .byte $28 ; ysize=48 - .byte $A0,$12,$AA, $A5,$0A, $A0,$21,$AA, $A8,$00, $0A, $A0,$1E,$AA, $AA,$00 - .byte $A0,$1D,$AA, $AC,$00, $A0,$1A,$AA, $0A, $AE,$00, $0A, $A0,$17,$AA - .byte $0A, $A0,$10,$00, $0A, $A0,$14,$AA, $0A, $A0,$14,$00, $0A - .byte $A0,$12,$AA, $A0,$17,$00, $AF,$AA, $0A, $A0,$19,$00, $AD,$AA, $0A - .byte $A5,$00, $A0,$01,$A0, $A0,$15,$00, $AB,$AA, $A6,$00, $A0,$01,$A0, $A3,$AA - .byte $AB,$00, $A0,$01,$A0, $A0,$02,$AA, $A0,$01,$A0, $A5,$00, $0A, $A9,$AA - .byte $A3,$00, $A0,$01,$A0, $F0, $A5,$AA, $A0,$01,$A0, $A8,$00, $A0,$01,$A0 - .byte $A6,$AA, $FA, $A0,$01,$A0, $A3,$00, $A9,$AA, $F0, $A0,$01,$A0 - .byte $A0,$01,$AF, $A9,$AA, $A0,$01,$A0, $00,$00, $A0,$01,$A0, $00,$00, $AA,$AA - .byte $A0,$01,$AF, $A0,$01,$A0, $F0, $A0,$FF,$AA, $A0,$BD,$AA - .byte $A1 -beast_slash11_rle: .byte $28 ; ysize=48 - .byte $AD,$AA, $0A, $AC,$00, $0A, $A0,$19,$AA, $0A, $AE,$00 - .byte $0A, $A0,$16,$AA, $0A, $A0,$12,$00, $0A, $A0,$13,$AA, $0A - .byte $A0,$15,$00, $0A, $AF,$AA, $0A, $A0,$19,$00, $0A, $AC,$AA - .byte $A0,$1C,$00, $0A, $AA,$AA, $0A, $A0,$1E,$00, $0A, $A7,$AA - .byte $A0,$21,$00, $0A, $A4,$AA, $0A, $A0,$24,$00, $A0,$02,$AA, $0A - .byte $A7,$00, $A3,$AA, $A0,$02,$A0, $AE,$00, $A0,$01,$A0, $A0,$02,$AA, $A0,$01,$A0 - .byte $A8,$00, $A0,$01,$AA, $A7,$00, $A0,$01,$A0, $A5,$AA, $AD,$00, $A0,$01,$A0 - .byte $A4,$AA, $A0,$01,$A0, $00,$00, $FF, $00, $F0, $00,$00 - .byte $A0,$01,$AA, $A0,$01,$A0, $00,$00, $FF, $A0,$01,$A0, $FF, $A8,$AA - .byte $A0,$01,$A0, $A9,$00, $A0,$02,$A0, $A7,$AA, $FA, $A0,$01,$AF, $A0,$01,$AA - .byte $FF, $F0, $00, $A0,$02,$AA, $FF, $A0,$01,$AA, $A0,$01,$AF - .byte $FA, $A0,$01,$AA, $A0,$01,$AF, $A9,$AA, $A4,$00, $A3,$A0, $AC,$AA - .byte $A0,$01,$AF, $A0,$01,$AA, $FF, $A4,$AA, $A0,$01,$AF, $A0,$21,$AA, $A0,$01,$AF - .byte $A0,$FF,$AA, $A0,$93,$AA - .byte $A1 -beast_slash12_rle: .byte $28 ; ysize=48 - .byte $A8,$AA, $0A, $A0,$15,$00, $0A, $A0,$10,$AA, $0A, $A0,$18,$00 - .byte $AE,$AA, $0A, $A0,$1A,$00, $0A, $AA,$AA, $0A, $A0,$1E,$00 - .byte $0A, $A7,$AA, $A0,$22,$00, $0A, $A4,$AA, $A0,$24,$00, $0A - .byte $A0,$02,$AA, $AF,$00, $11, $A0,$16,$00, $0A, $A0,$14,$00, $11 - .byte $A0,$41,$00, $A0,$02,$A0, $A0,$01,$AA, $A0,$02,$A0, $A0,$13,$00, $A0,$01,$A0, $A0,$01,$AA - .byte $A0,$02,$A0, $A5,$00, $F0, $00, $F0, $A3,$00, $A0,$01,$A0 - .byte $A6,$AA, $A0,$11,$00, $A6,$AA, $00,$00, $F0,$F0, $0F, $00 - .byte $0F, $F0, $A0,$02,$A0, $A8,$AA, $AF,$00, $A8,$AA, $A0,$01,$A0 - .byte $A3,$00, $FF, $A0,$01,$A0, $A0,$01,$AA, $A0,$01,$AF, $AA,$AA, $A0,$01,$A0 - .byte $A9,$00, $A0,$02,$A0, $AC,$AA, $FA, $A0,$01,$AF, $A0,$01,$A0, $A0,$01,$AF - .byte $FA, $AD,$AA, $A7,$A0, $A0,$11,$AA, $FA, $A0,$25,$AA, $FA - .byte $A0,$01,$AF, $A0,$01,$AA, $A0,$01,$AF, $A0,$FF,$AA, $A0,$67,$AA - .byte $A1 -beast_slash13_rle: .byte $28 ; ysize=48 - .byte $A0,$26,$00, $A0,$02,$AA, $A0,$27,$00, $A0,$01,$AA, $A0,$D5,$00, $11, $A0,$57,$00 - .byte $11, $A0,$62,$00, $A0,$01,$A0, $A0,$01,$AA, $A0,$02,$A0, $A0,$21,$00, $A0,$02,$A0 - .byte $00, $A6,$AA, $A0,$01,$A0, $A0,$1B,$00, $A0,$01,$A0, $AC,$AA, $A0,$01,$A0 - .byte $A0,$19,$00, $A0,$01,$A0, $AE,$AA, $A0,$18,$00, $A0,$01,$A0, $A0,$10,$AA, $A0,$01,$A0 - .byte $A0,$13,$00, $A0,$02,$A0, $A0,$14,$AA, $A0,$01,$A0, $AE,$00, $A0,$02,$A0, $A0,$19,$AA - .byte $A0,$01,$A0, $AA,$00, $A0,$01,$A0, $A0,$D7,$AA - .byte $A1 -beast_slash14_rle: .byte $28 ; ysize=48 - .byte $A0,$FF,$00, $A0,$4C,$00, $10, $A0,$27,$00, $11, $A0,$31,$00, $10 - .byte $A0,$27,$00, $11, $A0,$B2,$00, $A0,$01,$A0, $A0,$27,$00, $A0,$02,$AA, $A0,$01,$A0 - .byte $A0,$23,$00, $A0,$01,$A0, $A4,$AA, $A0,$22,$00, $A7,$AA, $A0,$20,$00, $A0,$01,$A0 - .byte $A9,$AA, $A0,$01,$A0, $A0,$1C,$00, $A0,$01,$A0, $AC,$AA, $A0,$01,$A0, $A0,$15,$00 - .byte $A0,$02,$A0, $A0,$12,$AA, $A0,$01,$A0, $A0,$11,$00, $A0,$01,$A0, $A0,$16,$AA, $A0,$01,$A0 - .byte $AE,$00, $A0,$01,$A0, $AD,$AA - .byte $A1 -beast_slash15_rle: .byte $28 ; ysize=48 - .byte $A0,$FF,$00, $A0,$99,$00, $01, $11, $A0,$27,$00, $01, $A0,$5C,$00 - .byte $11, $01, $A0,$26,$00, $01, $A0,$FF,$00, $A0,$7A,$00 - .byte $A1 -beast_slash16_rle: .byte $28 ; ysize=48 - .byte $A6,$22, $52,$52, $A0,$15,$66, $88, $A3,$55, $52, $AB,$22 - .byte $55,$55, $65, $A0,$15,$66, $88,$88, $A3,$55, $AB,$22, $55,$55 - .byte $A0,$16,$66, $68, $88, $A3,$55, $AA,$22, $55,$55, $65 - .byte $A0,$17,$66, $68, $85, $55,$55, $52, $22,$22, $02 - .byte $00, $20, $A4,$22, $55,$55, $A0,$17,$66, $88, $66 - .byte $88, $A3,$55, $A9,$22, $55,$55, $A0,$17,$66, $68, $88 - .byte $66, $88, $55,$55, $A8,$22, $52, $55, $88 - .byte $A0,$18,$66, $88, $86, $68, $88, $55, $A8,$22 - .byte $55,$55, $88, $A0,$19,$66, $88, $66, $88, $55 - .byte $A8,$22, $55,$55, $88, $A0,$19,$66, $68, $86, $68 - .byte $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88, $66 - .byte $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88, $66 - .byte $55, $A8,$22, $55,$55, $88, $A0,$1A,$66, $88, $66 - .byte $55,$55, $A7,$22, $55,$55, $88,$88, $86, $A0,$17,$66, $86 - .byte $88, $86, $55,$55, $A7,$22, $A3,$55, $88,$88, $86 - .byte $A0,$15,$66, $86, $88, $66, $88, $55,$55, $A7,$22 - .byte $25, $A3,$55, $A3,$88, $86, $A0,$12,$66, $A3,$88, $66 - .byte $88, $55, $A3,$22, $20,$20, $A4,$22, $A3,$55, $28 - .byte $A4,$88, $AF,$66, $86, $A4,$88, $86, $55,$55, $AA,$22 - .byte $55,$55, $22, $58, $A4,$88, $86, $AC,$66, $A7,$88 - .byte $55, $AB,$22, $25, $55, $22, $55,$55, $58 - .byte $A4,$88, $A9,$86, $88,$88, $A5,$58, $A3,$55, $AC,$22, $25 - .byte $22, $A4,$55, $AB,$58, $A9,$55, $25, $A0,$10,$22, $AB,$55 - .byte $A5,$25, $A0,$19,$22, $A5,$25, $A0,$91,$22 - .byte $A1 -beast_slash17_rle: .byte $28 ; ysize=48 - .byte $A0,$6F,$00, $A9,$01, $A0,$FF,$00, $A0,$AE,$00, $AB,$10, $A0,$FF,$00, $A0,$60,$00 - .byte $A9,$10, $A0,$28,$00 - .byte $A1 -beast_slash18_rle: .byte $28 ; ysize=48 - .byte $A0,$63,$00, $A3,$11, $A9,$00, $A9,$10, $A0,$FF,$00, $A0,$82,$00, $A4,$10 - .byte $A0,$2C,$00, $A4,$01, $A3,$11, $A0,$FF,$00, $A0,$30,$00, $AD,$10, $11 - .byte $A3,$01, $A0,$50,$00 - .byte $A1 -beast_slash19_rle: .byte $28 ; ysize=48 - .byte $A0,$5A,$00, $A3,$01, $00,$00, $01,$01, $00, $01,$01, $A0,$FF,$00 - .byte $A0,$AF,$00, $A4,$01, $A3,$00, $01,$01, $A0,$FF,$00, $A0,$35,$00, $11,$11 - .byte $A3,$00, $A4,$01, $AC,$00, $11, $A0,$5B,$00 - .byte $A1 -beast_slash20_rle: .byte $28 ; ysize=48 - .byte $A0,$FF,$00, $A0,$FF,$00, $A0,$FF,$00, $A0,$C3,$00 - .byte $A1 diff --git a/games/ootw/ootw_c1/ootw_c1.s b/games/ootw/ootw_c1/ootw_c1.s index 122df8cb..3c297dfd 100644 --- a/games/ootw/ootw_c1/ootw_c1.s +++ b/games/ootw/ootw_c1/ootw_c1.s @@ -155,13 +155,13 @@ end_message: .include "../gr_putsprite_crop.s" ; room backgrounds -.include "graphics/l1pool/ootw_pool.inc" -.include "graphics/l1caves/ootw_cavern.inc" -.include "graphics/l1caves/ootw_cavern2.inc" -.include "graphics/l1caves/ootw_cavern3.inc" -.include "graphics/l1rope/ootw_rope.inc" -.include "graphics/l1rope/ootw_swing.inc" -.include "graphics/l1underwater/ootw_underwater.inc" +.include "graphics/l1_pool/ootw_pool.inc" +.include "graphics/l1_caves/ootw_cavern.inc" +.include "graphics/l1_caves/ootw_cavern2.inc" +.include "graphics/l1_caves/ootw_cavern3.inc" +.include "graphics/l1_rope/ootw_rope.inc" +.include "graphics/l1_rope/ootw_swing.inc" +.include "graphics/l1_underwater/ootw_underwater.inc" ; sprites .include "../ootw_graphics/sprites/l1_background.inc" .include "../ootw_graphics/sprites/physicist.inc" @@ -169,7 +169,7 @@ end_message: .include "../ootw_graphics/sprites/slugs.inc" .include "../ootw_graphics/sprites/beast.inc" ; cutscene data -.include "graphics/l1end/ootw_l1end.inc" -.include "graphics/l1end_scenes/ootw_beast_end.inc" -.include "graphics/l1end_scenes/ootw_slug_end.inc" -.include "graphics/l1end_scenes/ootw_beast_intro.inc" +.include "graphics/l1_end/ootw_l1end.inc" +.include "graphics/l1_beast_end/ootw_beast_end.inc" +.include "graphics/l1_slug_end/ootw_slug_end.inc" +.include "graphics/l1_beast_intro/ootw_beast_intro.inc" diff --git a/games/ootw/ootw_c1/ootw_c1_beast.s b/games/ootw/ootw_c1/ootw_c1_beast.s index bec5c5f0..4e4ee36b 100644 --- a/games/ootw/ootw_c1/ootw_c1_beast.s +++ b/games/ootw/ootw_c1/ootw_c1_beast.s @@ -371,12 +371,12 @@ beast_end: ; Restore background to $c00 lda #<(cavern3_lzsa) - sta getsrc_smc+1 ; LZSA_SRC_LO + sta getsrc_smc+1 ; LZSA_SRC_LO lda #>(cavern3_lzsa) sta getsrc_smc+2 ; LZSA_SRC_HI lda #$c ; load image off-screen $c00 - jmp load_rle_gr + jmp decompress_lzsa2_fast beast_frames: .word beast_frame1 ; 0 @@ -404,27 +404,27 @@ beast_frames: ;======================== beast_slash_cutscene: - lda #beast_bg_rle - sta GBASH + lda #beast_bg_lzsa + sta getsrc_smc+2 ; LZSA_SRC_HI lda #$c - jsr load_rle_gr + jsr decompress_lzsa2_fast - ldx #0 + ldx #0h beast_slash_loop: lda beast_slash_frames,X - sta GBASL + sta getsrc_smc+1 ; LZSA_SRC_LO lda beast_slash_frames+1,X - sta GBASH + sta getsrc_smc+2 ; LZSA_SRC_HI txa pha lda #$10 - jsr load_rle_gr + jsr decompress_lzsa2_fast jsr gr_overlay @@ -452,25 +452,25 @@ beast_slash_end: beast_slash_frames: - .word beast_slash07_rle ; 0 - .word beast_slash08_rle ; 1 - .word beast_slash09_rle ; 2 - .word beast_slash10_rle ; 3 - .word beast_slash11_rle ; 4 - .word beast_slash12_rle ; 5 - .word beast_slash13_rle ; 6 - .word beast_slash14_rle ; 7 - .word beast_slash15_rle ; 8 - .word beast_slash16_rle ; 9 - .word beast_slash17_rle ; 10 - .word beast_slash18_rle ; 11 - .word beast_slash19_rle ; 12 - .word beast_slash20_rle ; 13 - .word beast_slash20_rle ; 14 - .word beast_slash20_rle ; 15 - .word beast_slash20_rle ; 16 - .word beast_slash20_rle ; 17 - .word beast_slash20_rle ; 18 - .word beast_slash20_rle ; 19 - .word beast_slash20_rle ; 20 + .word beast_slash07_lzsa ; 0 + .word beast_slash08_lzsa ; 1 + .word beast_slash09_lzsa ; 2 + .word beast_slash10_lzsa ; 3 + .word beast_slash11_lzsa ; 4 + .word beast_slash12_lzsa ; 5 + .word beast_slash13_lzsa ; 6 + .word beast_slash14_lzsa ; 7 + .word beast_slash15_lzsa ; 8 + .word beast_slash16_lzsa ; 9 + .word beast_slash17_lzsa ; 10 + .word beast_slash18_lzsa ; 11 + .word beast_slash19_lzsa ; 12 + .word beast_slash20_lzsa ; 13 + .word beast_slash20_lzsa ; 14 + .word beast_slash20_lzsa ; 15 + .word beast_slash20_lzsa ; 16 + .word beast_slash20_lzsa ; 17 + .word beast_slash20_lzsa ; 18 + .word beast_slash20_lzsa ; 19 + .word beast_slash20_lzsa ; 20