diff --git a/ootw/Makefile b/ootw/Makefile index 9a411856..d317480c 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -279,6 +279,7 @@ ootw_c15.o: ootw_c15.s \ collision.s door.s laser.s gun.s blast.s shield.s \ ootw_graphics/sprites/physicist.inc \ ootw_graphics/l15final/ootw_c15_bath.inc \ + ootw_graphics/l15final/ootw_c15_walk.inc \ ootw_graphics/l15final/ootw_c15_final.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 ae3ddfdc..5d47c78e 100644 --- a/ootw/ootw_c15.s +++ b/ootw/ootw_c15.s @@ -723,6 +723,9 @@ end_message: ; sprites .include "ootw_graphics/sprites/physicist.inc" .include "ootw_graphics/sprites/alien.inc" +; animations +.include "ootw_graphics/l15final/ootw_c15_walk.inc" + ;======================= ; Bath intro @@ -900,3 +903,15 @@ shot1_hole: .byte 0,0 ; STARTX H/L .byte 0,0 ; ENDX H/L .byte 0,$ff ; ENDY/STARTY + + + +; shot notes +; + from bottom-right to mid-left +; + from top-center to mid-right +; + from mid-right to mid-left +; + straight across bottom +; + from top-left to mid-right +; + from center-right to mid-left +; + diff --git a/ootw/ootw_graphics/l15final/Makefile b/ootw/ootw_graphics/l15final/Makefile index d0cd2698..5e38209e 100644 --- a/ootw/ootw_graphics/l15final/Makefile +++ b/ootw/ootw_graphics/l15final/Makefile @@ -3,7 +3,7 @@ include ../../../Makefile.inc PNG2RLE = ../../../gr-utils/png2rle PNG2LZ4 = ../../../gr-utils/png2lz4 -all: ootw_c15_bath.inc ootw_c15_final.inc +all: ootw_c15_bath.inc ootw_c15_walk.inc ootw_c15_final.inc ##### @@ -54,6 +54,23 @@ ootw_c15_bath.inc: $(PNG2RLE) \ $(PNG2RLE) asm bath_35.png bath_35_rle >> ootw_c15_bath.inc $(PNG2RLE) asm bath_end.png bath_end_rle >> ootw_c15_bath.inc +ootw_c15_walk.inc: $(PNG2RLE) \ + walk_00.png walk_01.png walk_02.png walk_03.png walk_04.png \ + walk_05.png walk_06.png walk_07.png walk_08.png walk_09.png \ + walk_10.png + $(PNG2RLE) asm walk_00.png walk00_rle > ootw_c15_walk.inc + $(PNG2RLE) asm walk_01.png walk01_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_02.png walk02_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_03.png walk03_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_04.png walk04_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_05.png walk05_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_06.png walk06_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_07.png walk07_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_08.png walk08_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_09.png walk09_rle >> ootw_c15_walk.inc + $(PNG2RLE) asm walk_10.png walk10_rle >> ootw_c15_walk.inc + + ootw_c15_final.inc: $(PNG2RLE) \ walkway1.png walkway2.png walkway3.png above_pit.png final.png $(PNG2RLE) asm walkway1.png walkway1_rle > ootw_c15_final.inc diff --git a/ootw/ootw_graphics/l15final/ootw_c15_walk.inc b/ootw/ootw_graphics/l15final/ootw_c15_walk.inc new file mode 100644 index 00000000..173a197b --- /dev/null +++ b/ootw/ootw_graphics/l15final/ootw_c15_walk.inc @@ -0,0 +1,113 @@ +walk00_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$B9,$AA, $A3,$0A, $A0,$25,$AA, $00,$00, $A0,$01,$A0, $A0,$25,$AA + .byte $F0, $57, $A0,$26,$AA, $7F, $77, $A0,$26,$AA, $07 + .byte $77, $A0,$26,$AA, $00, $07, $A0,$26,$AA, $77, $00 + .byte $0A, $A0,$27,$AA, $00, $A0,$ED,$AA + .byte $A1 +; cycles=6502 +walk01_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$E1,$AA, $A7,$00, $A0,$21,$AA, $A6,$00, $70, $A0,$21,$AA + .byte $A5,$00, $FF, $75, $A0,$21,$AA, $A5,$00, $77,$77, $A0,$21,$AA + .byte $10, $00,$00, $77, $00, $07, $77, $A0,$21,$AA + .byte $A4,$00, $77, $70, $00, $A0,$21,$AA, $A4,$00, $07 + .byte $A0,$01,$A7, $A0,$01,$A0, $A0,$21,$AA, $A5,$00, $A0,$23,$AA, $A3,$70, $00,$00 + .byte $A0,$23,$AA, $A3,$77, $00,$00, $A0,$23,$AA, $A3,$77, $00,$00, $A0,$23,$AA + .byte $A3,$77, $00,$00, $A0,$23,$AA + .byte $A1 +; cycles=1048 +walk02_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$E5,$AA, $A8,$0A, $A0,$1F,$AA, $0A, $A7,$00, $70 + .byte $A0,$1F,$AA, $A7,$00, $77, $57, $A0,$1E,$AA, $0A, $A6,$00 + .byte $7F, $77,$77, $A0,$1D,$AA, $A8,$00, $07, $77,$77, $A0,$1C,$AA + .byte $A0,$01,$A0, $00,$00, $A3,$01, $00,$00, $77, $70, $00 + .byte $A0,$01,$A7, $A0,$1C,$AA, $0A, $A8,$00, $77, $A0,$01,$A0, $00 + .byte $A0,$1C,$AA, $AA,$00, $A0,$1E,$AA, $AA,$00, $A0,$1E,$AA, $00,$00, $A4,$77 + .byte $A4,$00, $A0,$1E,$AA, $00,$00, $A4,$77, $A4,$00, $A0,$1E,$AA, $00,$00 + .byte $A3,$77, $07, $A4,$00, $A0,$1E,$AA + .byte $A1 +; cycles=913 +walk03_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$E9,$AA, $0A, $A6,$00, $0A, $A0,$1F,$AA, $0A + .byte $A8,$00, $A0,$1F,$AA, $A6,$00, $F0, $77, $57, $A0,$1E,$AA + .byte $0A, $A6,$00, $7F, $77,$77, $A0,$1D,$AA, $00,$00, $A3,$10 + .byte $00,$00, $70, $00, $77,$77, $A0,$1C,$AA, $A0,$01,$A0, $A7,$00 + .byte $77, $70, $07, $A0,$1D,$AA, $0A, $A8,$00, $77 + .byte $00, $0A, $A0,$1B,$AA, $0A, $AB,$00, $A0,$01,$A0, $00 + .byte $A0,$1A,$AA, $A0,$01,$A0, $00, $A5,$70, $A6,$00, $A0,$1C,$AA, $00 + .byte $A4,$77, $07, $A6,$00, $0A, $A0,$1B,$AA, $A5,$77, $A8,$00 + .byte $A0,$1B,$AA, $A4,$77, $A9,$00, $A0,$17,$AA + .byte $A1 +; cycles=724 +walk04_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$C7,$AA, $A7,$0A, $A0,$20,$AA, $0A, $A7,$00, $A0,$01,$A0 + .byte $A0,$1F,$AA, $A6,$00, $70, $77, $A0,$1F,$AA, $A7,$00, $FF + .byte $75, $A0,$1E,$AA, $A8,$00, $77,$77, $A0,$1D,$AA, $0A, $00,$00 + .byte $01,$01, $A3,$00, $70, $00, $77, $A0,$1D,$AA, $A8,$00 + .byte $77, $70, $00, $A0,$1D,$AA, $A9,$00, $A0,$01,$AA, $A0,$01,$A0 + .byte $00, $A0,$1B,$AA, $AA,$00, $A0,$1E,$AA, $00,$00, $A5,$77, $A3,$00 + .byte $A0,$1E,$AA, $00,$00, $A4,$77, $A4,$00, $A0,$1E,$AA, $00, $70 + .byte $A3,$77, $07, $A4,$00, $A0,$1E,$AA, $00, $A4,$77, $A5,$00 + .byte $A0,$15,$AA + .byte $A1 +; cycles=670 +walk05_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$F1,$AA, $0A, $A7,$00, $0A, $A0,$1F,$AA, $A7,$00 + .byte $70, $A0,$1F,$AA, $A7,$00, $F0, $57, $A0,$1E,$AA, $0A + .byte $A7,$00, $7F, $77, $A0,$1D,$AA, $0A, $00,$00, $10,$10 + .byte $00,$00, $70, $00, $07, $77, $A0,$1D,$AA, $0A + .byte $A7,$00, $07, $00, $07, $A0,$1D,$AA, $AA,$00, $A0,$01,$A0 + .byte $00, $A0,$1C,$AA, $AA,$00, $A0,$1E,$AA, $00,$00, $A5,$70, $A3,$00 + .byte $A0,$1E,$AA, $00,$00, $07, $A4,$77, $A3,$00, $A0,$1E,$AA, $A3,$00 + .byte $A3,$77, $A4,$00, $A0,$1E,$AA, $A3,$00, $A3,$77, $A4,$00, $A0,$11,$AA + .byte $A1 +; cycles=562 +walk06_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$F7,$AA, $0A, $A7,$00, $0A, $A0,$1F,$AA, $A7,$00 + .byte $70, $A0,$1F,$AA, $A7,$00, $F0, $57, $A0,$1E,$AA, $0A + .byte $A7,$00, $7F, $77, $A0,$1D,$AA, $0A, $00,$00, $10,$10 + .byte $00,$00, $70, $00, $07, $77, $A0,$1D,$AA, $0A + .byte $A7,$00, $07, $00, $07, $A0,$1D,$AA, $AA,$00, $A0,$01,$A0 + .byte $00, $A0,$1B,$AA, $AB,$00, $A0,$1D,$AA, $00,$00, $A5,$70, $A4,$00 + .byte $A0,$1D,$AA, $00,$00, $A5,$77, $A4,$00, $A0,$1D,$AA, $00,$00, $A4,$77 + .byte $A5,$00, $A0,$1D,$AA, $00,$00, $A4,$77, $A5,$00, $AB,$AA + .byte $A1 +; cycles=1875 +walk07_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$FB,$AA, $0A, $A8,$00, $A0,$1F,$AA, $A7,$00, $70 + .byte $A0,$1F,$AA, $0A, $A6,$00, $FF, $75, $A0,$1E,$AA, $0A + .byte $A7,$00, $77,$77, $A0,$1D,$AA, $A3,$00, $10,$10, $A3,$00, $70 + .byte $00, $77, $A0,$1D,$AA, $0A, $A7,$00, $77, $70 + .byte $00, $A0,$1C,$AA, $0A, $A9,$00, $A0,$01,$AA, $A0,$01,$A0, $A0,$1C,$AA + .byte $AA,$00, $A0,$1E,$AA, $A4,$00, $A4,$70, $00,$00, $A0,$1E,$AA, $A4,$00 + .byte $A4,$77, $00,$00, $A0,$1E,$AA, $A4,$00, $A4,$77, $00,$00, $A0,$1E,$AA + .byte $A4,$00, $A4,$77, $00,$00, $A8,$AA + .byte $A1 +; cycles=1794 +walk08_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$D9,$AA, $A8,$0A, $A0,$1F,$AA, $A8,$00, $A0,$01,$A0, $A0,$1F,$AA + .byte $A6,$00, $F0, $77, $A0,$1F,$AA, $A7,$00, $77,$77, $A0,$1E,$AA + .byte $A8,$00, $07, $77, $A0,$1D,$AA, $A3,$00, $A3,$01, $00,$00 + .byte $77, $70, $07, $A0,$1D,$AA, $A9,$00, $77, $A0,$01,$A0 + .byte $0A, $A0,$1B,$AA, $0A, $A9,$00, $A0,$02,$AA, $A0,$01,$A0, $A0,$1B,$AA + .byte $AA,$00, $A0,$1E,$AA, $A5,$00, $A4,$77, $00, $A0,$1E,$AA, $A5,$00 + .byte $A4,$77, $70, $A0,$1E,$AA, $A6,$00, $A4,$77, $A0,$1E,$AA, $A6,$00 + .byte $A4,$77, $A3,$AA + .byte $A1 +; cycles=1501 +walk09_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$DE,$AA, $A3,$0A, $A0,$24,$AA, $A4,$00, $A0,$23,$AA, $A5,$00 + .byte $A0,$23,$AA, $A5,$00, $A0,$21,$AA, $0A, $A6,$00, $A0,$20,$AA, $A3,$00 + .byte $A3,$01, $00,$00, $A0,$20,$AA, $A8,$00, $A0,$20,$AA, $A8,$00, $A0,$20,$AA + .byte $A8,$00, $A0,$20,$AA, $A3,$00, $A5,$77, $A0,$20,$AA, $A3,$00, $07 + .byte $A3,$77, $00, $A0,$20,$AA, $A4,$00, $A3,$77, $00, $A0,$20,$AA + .byte $A4,$00, $A3,$77, $00 + .byte $A1 +; cycles=1384 +walk10_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$FF,$AA, $A9,$AA, $0A, $A0,$27,$AA, $00, $A0,$26,$AA + .byte $00,$00, $A0,$25,$AA, $A3,$00, $A0,$24,$AA, $A0,$01,$A0, $A3,$00, $A0,$24,$AA + .byte $0A, $A3,$00, $A0,$23,$AA, $0A, $A4,$00, $A0,$23,$AA, $A5,$00 + .byte $A0,$23,$AA, $A3,$00, $77,$77, $A0,$23,$AA, $A3,$00, $77,$77, $A0,$23,$AA + .byte $A3,$00, $77,$77, $A0,$23,$AA, $A3,$00, $77,$77 + .byte $A1 +; cycles=1420 diff --git a/ootw/ootw_graphics/l15final/walk_00.png b/ootw/ootw_graphics/l15final/walk_00.png new file mode 100644 index 00000000..0101275c Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_00.png differ diff --git a/ootw/ootw_graphics/l15final/walk_01.png b/ootw/ootw_graphics/l15final/walk_01.png new file mode 100644 index 00000000..24b94be8 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_01.png differ diff --git a/ootw/ootw_graphics/l15final/walk_02.png b/ootw/ootw_graphics/l15final/walk_02.png new file mode 100644 index 00000000..4efc66eb Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_02.png differ diff --git a/ootw/ootw_graphics/l15final/walk_03.png b/ootw/ootw_graphics/l15final/walk_03.png new file mode 100644 index 00000000..13867ea4 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_03.png differ diff --git a/ootw/ootw_graphics/l15final/walk_04.png b/ootw/ootw_graphics/l15final/walk_04.png new file mode 100644 index 00000000..38571965 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_04.png differ diff --git a/ootw/ootw_graphics/l15final/walk_05.png b/ootw/ootw_graphics/l15final/walk_05.png new file mode 100644 index 00000000..bb0de509 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_05.png differ diff --git a/ootw/ootw_graphics/l15final/walk_06.png b/ootw/ootw_graphics/l15final/walk_06.png new file mode 100644 index 00000000..0413dd98 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_06.png differ diff --git a/ootw/ootw_graphics/l15final/walk_07.png b/ootw/ootw_graphics/l15final/walk_07.png new file mode 100644 index 00000000..deb27d18 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_07.png differ diff --git a/ootw/ootw_graphics/l15final/walk_08.png b/ootw/ootw_graphics/l15final/walk_08.png new file mode 100644 index 00000000..38ec833c Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_08.png differ diff --git a/ootw/ootw_graphics/l15final/walk_09.png b/ootw/ootw_graphics/l15final/walk_09.png new file mode 100644 index 00000000..62717d66 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_09.png differ diff --git a/ootw/ootw_graphics/l15final/walk_10.png b/ootw/ootw_graphics/l15final/walk_10.png new file mode 100644 index 00000000..abe5dea2 Binary files /dev/null and b/ootw/ootw_graphics/l15final/walk_10.png differ