diff --git a/games/ootw/ending/ending.s b/games/ootw/ending/ending.s index 3ccb5712..048d5c12 100644 --- a/games/ootw/ending/ending.s +++ b/games/ootw/ending/ending.s @@ -1,7 +1,5 @@ ; ootw -- It's the End of the Game as We Know It -; TODO: missing a bunch of frames - ; by Vince "Deater" Weaver @@ -12,12 +10,11 @@ ending: ; temporary debug - - lda #4 - sta DRAW_PAGE - lda #0 - sta DISP_PAGE - jmp handle_credits +; lda #4 +; sta DRAW_PAGE +; lda #0 +; sta DISP_PAGE +; jmp handle_credits ;========================= ; set up sound @@ -204,35 +201,67 @@ wait_until_keypressed: pickup_sequence: .byte 255 ; load to bg .word rooftop_bg_lzsa ; this - .byte 128+20 ; .word rooftop01_lzsa ; 03.22-04.15 - .byte 128+20 ; .word rooftop02_lzsa ; 04.15-04.19 - .byte 128+20 ; .word rooftop03_lzsa ; 04.19- - .byte 128+20 ; .word rooftop04_lzsa ; next - .byte 128+20 ; .word rooftop05_lzsa ; next - .byte 128+20 ; .word rooftop06_lzsa ; next - .byte 128+20 ; .word rooftop07_lzsa ; next - .byte 128+20 ; .word rooftop08_lzsa ; next - .byte 128+20 ; .word rooftop09_lzsa ; next - .byte 128+20 ; .word rooftop10_lzsa ; next - .byte 128+20 ; .word rooftop11_lzsa ; next - .byte 128+20 ; .word rooftop12_lzsa ; next - .byte 128+20 ; .word rooftop13_lzsa ; next - .byte 128+20 ; .word rooftop14_lzsa ; next - .byte 128+20 ; .word rooftop15_lzsa ; 25.13-25.16 (friend arriving) - .byte 128+20 ; .word rooftop16_lzsa ; 25.16-25.22 - .byte 128+20 ; .word rooftop17_lzsa ; 25.22-27.00 (friend stand) - .byte 128+20 ; .word rooftop18_lzsa ; 27.00-27.04 - .byte 128+20 ; .word rooftop19_lzsa ; 27.04-27.09 - .byte 128+20 ; .word rooftop20_lzsa ; 27.09-27.17 - .byte 128+20 ; .word rooftop21_lzsa ; 27.17-27.22 - .byte 128+20 ; .word rooftop22_lzsa ; 27.22- - .byte 128+20 ; .word rooftop23_lzsa ; 29.00- (friend reaching) - .byte 128+20 ; .word rooftop24_lzsa ; 29.11- - .byte 128+20 ; .word rooftop25_lzsa ; 29.17- (mouth open) - .byte 128+20 ; .word rooftop26_lzsa ; 30.03- (mouth closed) - .byte 128+20 ; .word rooftop27_lzsa ; 30.14- (start to pick up) - .byte 128+20 ; .word rooftop28_lzsa ; 30.22- (halfway up) - .byte 128+20 ; .word rooftop29_lzsa ; 31.00- (standing) + .byte 128+72 ; .word rooftop01_lzsa ; 03.22 (18) + .byte 128+8 ; .word rooftop02a_lzsa ; 04.15 (2) arrive + .byte 128+8 ; .word rooftop02_lzsa ; 04.17 (2) arrive + .byte 128+24 ; .word rooftop03_lzsa ; 04.19 (6) + .byte 128+120 ; .word rooftop04_lzsa ; 05.00 (44)-> 184 + + .byte 64 + .word rooftop04_lzsa ; 05.00 (44)-> 184 + + .byte 128+50 ; .word rooftop05_lzsa ; 06.19 (13) + .byte 128+72 ; .word rooftop06_lzsa ; 07.07 (18) + .byte 128+64 ; .word rooftop07_lzsa ; 08.00 (16) + .byte 128+120 ; .word rooftop08_lzsa ; 08.16 (31) + .byte 128+56 ; .word rooftop09_lzsa ; 09.22 (14) + .byte 128+76 ; .word rooftop10_lzsa ; 10.11 (19) + + .byte 128+100 ; .word rooftop11a_lzsa ; 11.05 (25) + .byte 128+100 ; .word rooftop11b_lzsa ; 12.05 (25) + .byte 128+52 ; .word rooftop11clzsa ; 13.05 (13) + + .byte 100 + .word rooftop11a_lzsa ; 13.18 (50) + .byte 100 + .word rooftop11a_lzsa ; 13.18 (50) -> 200 + .byte 52 + .word rooftop12_lzsa ; 15.17 (13) + .byte 128+80 ; .word rooftop13_lzsa ; 16.05 (20) + + .byte 120 + .word rooftop11_lzsa ; 17.00 (40) + .byte 128+120 ; .word rooftop12_lzsa ; 18.15 (30) + .byte 128+96 ; .word rooftop13_lzsa ; 19.20 (24) + + .byte 100 + .word rooftop11_lzsa ; 20.19 (50) + .byte 100 + .word rooftop11_lzsa ; 20.19 (50) ->200 + + .byte 128+104 ; .word rooftop12_lzsa ; 22.19 (26) + .byte 128+100 ; .word rooftop13_lzsa ; 23.20 (25) + + .byte 20 + .word rooftop11_lzsa ; 24.20 (5) + + .byte 50 + .word rooftop14_lzsa ; 25.00 (13) + .byte 128+12 ; .word rooftop15_lzsa ; 25.13 (3) + .byte 128+24 ; .word rooftop16_lzsa ; 25.16 (6) + .byte 128+100 ; .word rooftop17_lzsa ; 25.22 (28) friend stand + .byte 128+16 ; .word rooftop18_lzsa ; 27.00 (4) + .byte 128+20 ; .word rooftop19_lzsa ; 27.04 (5) + .byte 128+32 ; .word rooftop20_lzsa ; 27.09 (8) + .byte 128+20 ; .word rooftop21_lzsa ; 27.17 (5) + .byte 128+100 ; .word rooftop22_lzsa ; 27.22 (28) + .byte 128+44 ; .word rooftop23_lzsa ; 29.00 (11) friend reaching + .byte 128+24 ; .word rooftop24_lzsa ; 29.11 (6) + .byte 128+44 ; .word rooftop25_lzsa ; 29.17 (11) mouth open + .byte 128+44 ; .word rooftop26_lzsa ; 30.03 (11) mouth closed + .byte 128+32 ; .word rooftop27_lzsa ; 30.14 (8) start to pick up) + .byte 128+12 ; .word rooftop28_lzsa ; 30.22 (3) halfway up + .byte 128+24 ; .word rooftop29_lzsa ; 31.00 (6) standing .byte 0 ; 31.06 finish wing_sequence: diff --git a/games/ootw/ending/graphics/ending/Makefile b/games/ootw/ending/graphics/ending/Makefile index 18e458a1..87ae3033 100644 --- a/games/ootw/ending/graphics/ending/Makefile +++ b/games/ootw/ending/graphics/ending/Makefile @@ -15,9 +15,12 @@ ootw_c16_end.inc: \ right_unfurl4.lzsa right_unfurl5.lzsa \ sky_bg.lzsa \ rooftop_bg.lzsa \ - rooftop01.lzsa rooftop02.lzsa rooftop03.lzsa rooftop04.lzsa \ + rooftop01.lzsa rooftop02.lzsa \ + rooftop02a.lzsa rooftop03.lzsa rooftop04.lzsa \ rooftop05.lzsa rooftop06.lzsa rooftop07.lzsa rooftop08.lzsa \ - rooftop09.lzsa rooftop10.lzsa rooftop11.lzsa rooftop12.lzsa \ + rooftop09.lzsa rooftop10.lzsa rooftop11.lzsa \ + rooftop11a.lzsa rooftop11b.lzsa rooftop11c.lzsa \ + rooftop12.lzsa \ rooftop13.lzsa rooftop14.lzsa rooftop15.lzsa rooftop16.lzsa \ rooftop17.lzsa rooftop18.lzsa rooftop19.lzsa rooftop20.lzsa \ rooftop21.lzsa rooftop22.lzsa rooftop23.lzsa rooftop24.lzsa \ @@ -47,6 +50,7 @@ ootw_c16_end.inc: \ black.lzsa echo "rooftop_bg_lzsa: .incbin \"rooftop_bg.lzsa\"" > ootw_c16_end.inc echo "rooftop01_lzsa: .incbin \"rooftop01.lzsa\"" >> ootw_c16_end.inc + echo "rooftop02a_lzsa: .incbin \"rooftop02a.lzsa\"" >> ootw_c16_end.inc echo "rooftop02_lzsa: .incbin \"rooftop02.lzsa\"" >> ootw_c16_end.inc echo "rooftop03_lzsa: .incbin \"rooftop03.lzsa\"" >> ootw_c16_end.inc echo "rooftop04_lzsa: .incbin \"rooftop04.lzsa\"" >> ootw_c16_end.inc @@ -56,6 +60,9 @@ ootw_c16_end.inc: \ echo "rooftop08_lzsa: .incbin \"rooftop08.lzsa\"" >> ootw_c16_end.inc echo "rooftop09_lzsa: .incbin \"rooftop09.lzsa\"" >> ootw_c16_end.inc echo "rooftop10_lzsa: .incbin \"rooftop10.lzsa\"" >> ootw_c16_end.inc + echo "rooftop11a_lzsa: .incbin \"rooftop11a.lzsa\"" >> ootw_c16_end.inc + echo "rooftop11b_lzsa: .incbin \"rooftop11b.lzsa\"" >> ootw_c16_end.inc + echo "rooftop11c_lzsa: .incbin \"rooftop11c.lzsa\"" >> ootw_c16_end.inc echo "rooftop11_lzsa: .incbin \"rooftop11.lzsa\"" >> ootw_c16_end.inc echo "rooftop12_lzsa: .incbin \"rooftop12.lzsa\"" >> ootw_c16_end.inc echo "rooftop13_lzsa: .incbin \"rooftop13.lzsa\"" >> ootw_c16_end.inc diff --git a/games/ootw/ending/graphics/ending/rooftop02.png b/games/ootw/ending/graphics/ending/rooftop02.png index 295ff3a2..739a614d 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop02.png and b/games/ootw/ending/graphics/ending/rooftop02.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop02a.png b/games/ootw/ending/graphics/ending/rooftop02a.png new file mode 100644 index 00000000..ccc11836 Binary files /dev/null and b/games/ootw/ending/graphics/ending/rooftop02a.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop03.png b/games/ootw/ending/graphics/ending/rooftop03.png index 406df688..30dee09d 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop03.png and b/games/ootw/ending/graphics/ending/rooftop03.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop04.png b/games/ootw/ending/graphics/ending/rooftop04.png index bcba42a7..c1314809 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop04.png and b/games/ootw/ending/graphics/ending/rooftop04.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop05.png b/games/ootw/ending/graphics/ending/rooftop05.png index 83b94a34..5f490b3f 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop05.png and b/games/ootw/ending/graphics/ending/rooftop05.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop06.png b/games/ootw/ending/graphics/ending/rooftop06.png index cbb5e004..a6c9ff3e 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop06.png and b/games/ootw/ending/graphics/ending/rooftop06.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop07.png b/games/ootw/ending/graphics/ending/rooftop07.png index e11ca4dc..acab57d0 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop07.png and b/games/ootw/ending/graphics/ending/rooftop07.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop08.png b/games/ootw/ending/graphics/ending/rooftop08.png index 296bc841..643e7a33 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop08.png and b/games/ootw/ending/graphics/ending/rooftop08.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop09.png b/games/ootw/ending/graphics/ending/rooftop09.png index c96443df..c3fe4458 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop09.png and b/games/ootw/ending/graphics/ending/rooftop09.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop10.png b/games/ootw/ending/graphics/ending/rooftop10.png index 0b574fb5..5e30ceac 100644 Binary files a/games/ootw/ending/graphics/ending/rooftop10.png and b/games/ootw/ending/graphics/ending/rooftop10.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop11a.png b/games/ootw/ending/graphics/ending/rooftop11a.png new file mode 100644 index 00000000..a09b7b31 Binary files /dev/null and b/games/ootw/ending/graphics/ending/rooftop11a.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop11b.png b/games/ootw/ending/graphics/ending/rooftop11b.png new file mode 100644 index 00000000..d804449f Binary files /dev/null and b/games/ootw/ending/graphics/ending/rooftop11b.png differ diff --git a/games/ootw/ending/graphics/ending/rooftop11c.png b/games/ootw/ending/graphics/ending/rooftop11c.png new file mode 100644 index 00000000..d6c47eff Binary files /dev/null and b/games/ootw/ending/graphics/ending/rooftop11c.png differ