diff --git a/ootw/Makefile b/ootw/Makefile index 03c70436..e57b5056 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -286,7 +286,8 @@ ootw_c15.o: ootw_c15.s \ ootw_graphics/l15final/ootw_c15_bath.inc \ ootw_graphics/l15final/ootw_c15_walk.inc \ ootw_graphics/l15final/ootw_c15_final.inc \ - ootw_graphics/l15final/ootw_c15_walkway.inc + ootw_graphics/l15final/ootw_c15_walkway.inc \ + ootw_graphics/l15final/ootw_c15_bridge.inc ca65 -o ootw_c15.o ootw_c15.s -l ootw_c15.lst diff --git a/ootw/ootw_c15.s b/ootw/ootw_c15.s index 21e5ef61..adf08638 100644 --- a/ootw/ootw_c15.s +++ b/ootw/ootw_c15.s @@ -1028,6 +1028,7 @@ end_message: ; animations .include "ootw_graphics/l15final/ootw_c15_walk.inc" .include "ootw_graphics/l15final/ootw_c15_walkway.inc" +.include "ootw_graphics/l15final/ootw_c15_bridge.inc" ;======================= diff --git a/ootw/ootw_graphics/l15final/Makefile b/ootw/ootw_graphics/l15final/Makefile index 5c30a4ce..ab5abb72 100644 --- a/ootw/ootw_graphics/l15final/Makefile +++ b/ootw/ootw_graphics/l15final/Makefile @@ -3,7 +3,8 @@ include ../../../Makefile.inc PNG2RLE = ../../../gr-utils/png2rle PNG2LZ4 = ../../../gr-utils/png2lz4 -all: ootw_c15_bath.inc ootw_c15_walk.inc ootw_c15_final.inc ootw_c15_walkway.inc +all: ootw_c15_bath.inc ootw_c15_walk.inc ootw_c15_final.inc \ + ootw_c15_walkway.inc ootw_c15_bridge.inc ##### @@ -76,9 +77,8 @@ ootw_c15_walk.inc: $(PNG2RLE) \ ootw_c15_final.inc: $(PNG2RLE) \ - walkway1.png walkway3.png above_pit.png final.png + walkway1.png above_pit.png final.png $(PNG2RLE) asm walkway1.png walkway1_rle > ootw_c15_final.inc - $(PNG2RLE) asm walkway3.png walkway3_rle >> ootw_c15_final.inc $(PNG2RLE) asm above_pit.png above_pit_rle >> ootw_c15_final.inc $(PNG2RLE) asm final.png final_rle >> ootw_c15_final.inc @@ -96,6 +96,17 @@ ootw_c15_walkway.inc: $(PNG2RLE) \ $(PNG2RLE) asm crash7.png crash7_rle >> ootw_c15_walkway.inc +ootw_c15_bridge.inc: $(PNG2RLE) \ + walkway3.png \ + lshot1.png lshot2.png lshot3.png lshot4.png lshot5.png lshot6.png + $(PNG2RLE) asm walkway3.png walkway3_rle > ootw_c15_bridge.inc + $(PNG2RLE) asm lshot1.png lshot1_rle >> ootw_c15_bridge.inc + $(PNG2RLE) asm lshot2.png lshot2_rle >> ootw_c15_bridge.inc + $(PNG2RLE) asm lshot3.png lshot3_rle >> ootw_c15_bridge.inc + $(PNG2RLE) asm lshot4.png lshot4_rle >> ootw_c15_bridge.inc + $(PNG2RLE) asm lshot5.png lshot5_rle >> ootw_c15_bridge.inc + $(PNG2RLE) asm lshot6.png lshot6_rle >> ootw_c15_bridge.inc + ##### diff --git a/ootw/ootw_graphics/l15final/lshot1.png b/ootw/ootw_graphics/l15final/lshot1.png new file mode 100644 index 00000000..c54667e0 Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot1.png differ diff --git a/ootw/ootw_graphics/l15final/lshot2.png b/ootw/ootw_graphics/l15final/lshot2.png new file mode 100644 index 00000000..d86f650f Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot2.png differ diff --git a/ootw/ootw_graphics/l15final/lshot3.png b/ootw/ootw_graphics/l15final/lshot3.png new file mode 100644 index 00000000..f0c00ce4 Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot3.png differ diff --git a/ootw/ootw_graphics/l15final/lshot4.png b/ootw/ootw_graphics/l15final/lshot4.png new file mode 100644 index 00000000..c8006f54 Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot4.png differ diff --git a/ootw/ootw_graphics/l15final/lshot5.png b/ootw/ootw_graphics/l15final/lshot5.png new file mode 100644 index 00000000..b5195e9e Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot5.png differ diff --git a/ootw/ootw_graphics/l15final/lshot6.png b/ootw/ootw_graphics/l15final/lshot6.png new file mode 100644 index 00000000..5716bdb4 Binary files /dev/null and b/ootw/ootw_graphics/l15final/lshot6.png differ diff --git a/ootw/ootw_graphics/l15final/ootw_c15_bridge.inc b/ootw/ootw_graphics/l15final/ootw_c15_bridge.inc new file mode 100644 index 00000000..c55b7b0f --- /dev/null +++ b/ootw/ootw_graphics/l15final/ootw_c15_bridge.inc @@ -0,0 +1,76 @@ +walkway3_rle: .byte $28 ; ysize=48 + .byte $A7,$66, $26, $A3,$22, $26, $A7,$66, $26, $A7,$66 + .byte $26, $A3,$22, $26, $A7,$66, $26, $22, $A5,$66 + .byte $22,$22, $A3,$52, $22, $26, $A4,$66, $26, $A3,$22 + .byte $26, $A4,$66, $26, $22, $A3,$52, $22, $26 + .byte $A5,$66, $A4,$22, $A3,$26, $22,$22, $52, $A3,$55, $52 + .byte $22,$22, $A3,$26, $22,$22, $52, $22,$22, $A3,$26, $22,$22 + .byte $52, $A3,$55, $52, $22,$22, $A3,$26, $AA,$22, $A5,$55 + .byte $AF,$22, $A5,$55, $AE,$22, $52, $A5,$55, $52, $AD,$22 + .byte $52, $A5,$55, $52, $AD,$22, $A7,$55, $AD,$22, $A7,$55 + .byte $AD,$22, $A7,$55, $AD,$22, $A7,$55, $AD,$22, $A7,$55, $AD,$22 + .byte $A7,$55, $AB,$22, $55, $22, $A7,$55, $22,$22, $55 + .byte $A5,$22, $55, $A4,$22, $A7,$55, $AA,$22, $55, $22,$22 + .byte $A7,$55, $A3,$22, $25, $A5,$22, $25, $A3,$22, $A7,$55 + .byte $A9,$22, $55, $A3,$22, $A7,$55, $AD,$22, $A7,$55, $A8,$22 + .byte $55, $A4,$22, $A7,$55, $AD,$22, $A7,$55, $A7,$22, $A0,$28,$27 + .byte $22,$22, $A3,$52, $AE,$22, $A3,$52, $AF,$22, $A4,$52, $A5,$55 + .byte $52, $AA,$22, $52, $A5,$55, $52, $AB,$22, $52 + .byte $A6,$55, $A3,$00, $05, $55, $52, $A9,$22, $55,$55 + .byte $00,$00, $55, $05, $55, $52, $A9,$22, $52 + .byte $55, $05, $A3,$00, $55, $A6,$00, $55, $52 + .byte $A7,$22, $A3,$55, $00,$00, $55, $00, $05, $55 + .byte $52, $A8,$22, $55, $05, $AC,$00, $55, $22,$22 + .byte $52, $A3,$22, $52, $55, $00, $55, $00,$00 + .byte $55, $00,$00, $05, $55, $A7,$22, $52, $55 + .byte $AD,$00, $05, $55, $22, $55, $A3,$22, $55 + .byte $05, $00, $05, $00,$00, $05, $A3,$00, $55 + .byte $52, $A6,$22, $55, $AF,$00, $55, $22, $55 + .byte $22,$22, $52, $55, $AA,$00, $55, $A6,$22, $55 + .byte $AF,$00, $05, $55,$55, $22,$22, $55, $AB,$00, $55 + .byte $52, $A4,$22, $55, $A0,$11,$00, $55,$55, $22,$22, $55 + .byte $AC,$00, $55, $A4,$22, $55, $A0,$11,$00, $55,$55, $22,$22 + .byte $55, $AC,$00, $55, $A4,$22, $55, $A0,$11,$00, $55,$55 + .byte $22,$22, $55, $AC,$00, $55, $A4,$22, $55, $A7,$00 + .byte $A1 +; cycles=2054 +lshot1_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$96,$AA, $1A,$1A, $A0,$1D,$11, $1A, $A6,$AA, $1A + .byte $A0,$21,$11, $1A, $A3,$AA, $1A, $A0,$25,$11, $A0,$01,$AA, $A0,$FF,$11 + .byte $A0,$B9,$11 + .byte $A1 +; cycles=5098 +lshot2_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$C7,$AA, $1A, $AB,$11, $1A, $A0,$1A,$AA, $AF,$11 + .byte $1A, $A0,$17,$AA, $A0,$12,$11, $A0,$16,$AA, $A0,$13,$11, $A0,$15,$AA, $A0,$13,$11 + .byte $A0,$15,$AA, $A0,$13,$11, $A0,$15,$AA, $A0,$13,$11, $A0,$15,$AA, $A0,$12,$11, $A0,$16,$AA + .byte $A0,$01,$A1, $A0,$11,$11, $A0,$17,$AA, $A0,$10,$11, $A0,$18,$AA, $A0,$10,$11, $A0,$18,$AA + .byte $A0,$01,$A1, $AE,$11, $A0,$1A,$AA, $A0,$01,$A1, $AB,$11, $A0,$01,$A1, $AD,$AA + .byte $A1 +; cycles=1823 +lshot3_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$F3,$AA, $A5,$11, $1A, $A0,$22,$AA, $A6,$11, $A0,$22,$AA + .byte $A0,$01,$A1, $A3,$11, $A0,$01,$A1, $A0,$FF,$AA, $A0,$7A,$AA + .byte $A1 +; cycles=3397 +lshot4_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$ED,$AA, $8A, $18, $AE,$11, $88, $A0,$16,$AA + .byte $88, $A0,$11,$11, $88, $A0,$15,$AA, $81, $A0,$10,$11, $81 + .byte $88, $A0,$15,$AA, $A0,$01,$A8, $88, $81, $AC,$11, $81 + .byte $88, $A0,$01,$A8, $A0,$18,$AA, $A0,$02,$A8, $AB,$A1, $A0,$02,$A8, $A0,$FF,$AA + .byte $A0,$25,$AA + .byte $A1 +; cycles=1102 +lshot5_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$EE,$AA, $88, $AD,$11, $88, $A0,$18,$AA, $88 + .byte $AF,$11, $88, $A0,$17,$AA, $81, $AE,$11, $81, $88 + .byte $A0,$17,$AA, $A0,$01,$A8, $88, $81, $AA,$11, $81, $88 + .byte $A0,$01,$A8, $A0,$FF,$AA, $A0,$4D,$AA + .byte $A1 +; cycles=2182 +lshot6_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$F0,$AA, $88, $A9,$A2, $52, $55, $A0,$01,$A5 + .byte $A0,$1C,$AA, $A0,$02,$A8, $8A, $A3,$2A, $52, $A0,$02,$A5, $A0,$FF,$AA + .byte $A0,$A0,$AA + .byte $A1 +; cycles=4423 diff --git a/ootw/ootw_graphics/l15final/ootw_c15_final.inc b/ootw/ootw_graphics/l15final/ootw_c15_final.inc index c05e3a3f..a337da2c 100644 --- a/ootw/ootw_graphics/l15final/ootw_c15_final.inc +++ b/ootw/ootw_graphics/l15final/ootw_c15_final.inc @@ -48,42 +48,6 @@ walkway1_rle: .byte $28 ; ysize=48 .byte $AD,$00, $55, $22,$22 .byte $A1 ; cycles=20667 -walkway3_rle: .byte $28 ; ysize=48 - .byte $A7,$66, $26, $A3,$22, $26, $A7,$66, $26, $A7,$66 - .byte $26, $A3,$22, $26, $A7,$66, $26, $22, $A5,$66 - .byte $22,$22, $A3,$52, $22, $26, $A4,$66, $26, $A3,$22 - .byte $26, $A4,$66, $26, $22, $A3,$52, $22, $26 - .byte $A5,$66, $A4,$22, $A3,$26, $22,$22, $52, $A3,$55, $52 - .byte $22,$22, $A3,$26, $22,$22, $52, $22,$22, $A3,$26, $22,$22 - .byte $52, $A3,$55, $52, $22,$22, $A3,$26, $AA,$22, $A5,$55 - .byte $AF,$22, $A5,$55, $AE,$22, $52, $A5,$55, $52, $AD,$22 - .byte $52, $A5,$55, $52, $AD,$22, $A7,$55, $AD,$22, $A7,$55 - .byte $AD,$22, $A7,$55, $AD,$22, $A7,$55, $AD,$22, $A7,$55, $AD,$22 - .byte $A7,$55, $AB,$22, $55, $22, $A7,$55, $22,$22, $55 - .byte $A5,$22, $55, $A4,$22, $A7,$55, $AA,$22, $55, $22,$22 - .byte $A7,$55, $A3,$22, $25, $A5,$22, $25, $A3,$22, $A7,$55 - .byte $A9,$22, $55, $A3,$22, $A7,$55, $AD,$22, $A7,$55, $A8,$22 - .byte $55, $A4,$22, $A7,$55, $AD,$22, $A7,$55, $A7,$22, $A0,$28,$27 - .byte $22,$22, $A3,$52, $AE,$22, $A3,$52, $AF,$22, $A4,$52, $A5,$55 - .byte $52, $AA,$22, $52, $A5,$55, $52, $AB,$22, $52 - .byte $A6,$55, $A3,$00, $05, $55, $52, $A9,$22, $55,$55 - .byte $00,$00, $55, $05, $55, $52, $A9,$22, $52 - .byte $55, $05, $A3,$00, $55, $A6,$00, $55, $52 - .byte $A7,$22, $A3,$55, $00,$00, $55, $00, $05, $55 - .byte $52, $A8,$22, $55, $05, $AC,$00, $55, $22,$22 - .byte $52, $A3,$22, $52, $55, $00, $55, $00,$00 - .byte $55, $00,$00, $05, $55, $A7,$22, $52, $55 - .byte $AD,$00, $05, $55, $22, $55, $A3,$22, $55 - .byte $05, $00, $05, $00,$00, $05, $A3,$00, $55 - .byte $52, $A6,$22, $55, $AF,$00, $55, $22, $55 - .byte $22,$22, $52, $55, $AA,$00, $55, $A6,$22, $55 - .byte $AF,$00, $05, $55,$55, $22,$22, $55, $AB,$00, $55 - .byte $52, $A4,$22, $55, $A0,$11,$00, $55,$55, $22,$22, $55 - .byte $AC,$00, $55, $A4,$22, $55, $A0,$11,$00, $55,$55, $22,$22 - .byte $55, $AC,$00, $55, $A4,$22, $55, $A0,$11,$00, $55,$55 - .byte $22,$22, $55, $AC,$00, $55, $A4,$22, $55, $A7,$00 - .byte $A1 -; cycles=2054 above_pit_rle: .byte $28 ; ysize=48 .byte $A5,$22, $02, $AA,$00, $22, $55, $22,$22, $AD,$00 .byte $02, $AA,$22, $02, $AB,$00, $22, $55, $52