diff --git a/ootw/Makefile b/ootw/Makefile index f8afed87..7c1804b7 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -63,7 +63,8 @@ ootw_c2.o: ootw_c2.s \ ootw_graphics/sprites/sprites_friend.inc \ ootw_c2_cage.s ootw_c2_jail.s ootw_c2_elevator.s ootw_c2_intro.s \ ootw_graphics/l2cage/ootw_c2_cage.inc \ - ootw_graphics/l2intro/ootw_l2intro.inc + ootw_graphics/l2intro/ootw_l2intro.inc \ + ootw_graphics/l2laser/ootw_c2_laser.inc ca65 -o ootw_c2.o ootw_c2.s -l ootw_c2.lst #### diff --git a/ootw/ootw_c2.s b/ootw/ootw_c2.s index 053df36b..1ff0351b 100644 --- a/ootw/ootw_c2.s +++ b/ootw/ootw_c2.s @@ -139,5 +139,6 @@ end_message: .include "ootw_graphics/l2intro/ootw_l2intro.inc" ; city movie .include "ootw_graphics/city/city_movie.inc" - +; laser movie +.include "ootw_graphics/l2laser/ootw_c2_laser.inc" diff --git a/ootw/ootw_c2_jail.s b/ootw/ootw_c2_jail.s index fd3ea16b..026ce7fd 100644 --- a/ootw/ootw_c2_jail.s +++ b/ootw/ootw_c2_jail.s @@ -819,3 +819,47 @@ draw_gun: sta INH jmp put_sprite_crop + + + + + ; blank screen + ; off (1) + ; 8 until green on (2) + ; 25 until gren off (1) + ; 25 until green on (2) + ; 24 until hand grab (3) + ; 8 until next (4) + ; 8 until next (5) + ; 8 until next (6) + ; 8 until next (7) + ; 8 until next (8) + ; 40 of blank + +laser_movie: + .word laserg_01_rle + + .word laserg_02_rle + .word laserg_02_rle + .word laserg_02_rle + + .word laserg_01_rle + .word laserg_01_rle + .word laserg_01_rle + + .word laserg_02_rle + .word laserg_02_rle + .word laserg_02_rle + + .word laserg_03_rle + .word laserg_04_rle + .word laserg_05_rle + .word laserg_06_rle + .word laserg_07_rle + .word laserg_08_rle + + .word laserg_blank_rle + .word laserg_blank_rle + .word laserg_blank_rle + .word laserg_blank_rle + .word laserg_blank_rle diff --git a/ootw/ootw_graphics/l2laser/Makefile b/ootw/ootw_graphics/l2laser/Makefile new file mode 100644 index 00000000..06800579 --- /dev/null +++ b/ootw/ootw_graphics/l2laser/Makefile @@ -0,0 +1,30 @@ +include ../../../Makefile.inc + +PNG2RLE = ../../../gr-utils/png2rle +PNG2LZ4 = ../../../gr-utils/png2lz4 + +all: ootw_c2_laser.inc + +##### + +ootw_c2_laser.inc: $(PNG2RLE) \ + laser_bg.png \ + laserg01.png laserg02.png laserg03.png laserg04.png \ + laserg05.png laserg06.png laserg07.png laserg08.png blank.png + $(PNG2RLE) asm laser_bg.png laser_bg_rle > ootw_c2_laser.inc + $(PNG2RLE) asm laserg01.png laserg_01_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg02.png laserg_02_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg03.png laserg_03_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg04.png laserg_04_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg05.png laserg_05_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg06.png laserg_06_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg07.png laserg_07_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm laserg08.png laserg_08_rle >> ootw_c2_laser.inc + $(PNG2RLE) asm blank.png laserg_blank_rle >> ootw_c2_laser.inc + + +##### + +clean: + rm -f *~ *.o *.lst *.lzz *.inc + diff --git a/ootw/ootw_graphics/l2laser/blank.png b/ootw/ootw_graphics/l2laser/blank.png new file mode 100644 index 00000000..a0a66c43 Binary files /dev/null and b/ootw/ootw_graphics/l2laser/blank.png differ diff --git a/ootw/ootw_graphics/l2laser/ootw_c2_laser.inc b/ootw/ootw_graphics/l2laser/ootw_c2_laser.inc new file mode 100644 index 00000000..e485ba26 --- /dev/null +++ b/ootw/ootw_graphics/l2laser/ootw_c2_laser.inc @@ -0,0 +1,144 @@ +laser_bg_rle: .byte $28 ; ysize=48 + .byte $A0,$1B,$22, $66,$66, $A7,$22, $A4,$66, $A0,$1B,$22, $66,$66, $A7,$22 + .byte $A4,$66, $A9,$22, $52,$52, $A0,$10,$22, $66,$66, $A8,$22, $A3,$66 + .byte $A0,$1B,$22, $66,$66, $A8,$22, $A3,$66, $A0,$1B,$22, $66,$66, $A8,$22 + .byte $A3,$66, $A0,$1B,$22, $66, $A9,$22, $26, $66,$66, $A0,$1B,$22 + .byte $66, $AA,$22, $66,$66, $A0,$1B,$22, $66, $AA,$22, $66,$66 + .byte $A0,$1B,$22, $26, $AA,$22, $66,$66, $A0,$26,$22, $66,$66, $A0,$26,$22 + .byte $66,$66, $A0,$12,$22, $55, $65, $A0,$12,$22, $66,$66, $A0,$12,$22 + .byte $26,$26, $A0,$13,$22, $66, $A0,$27,$22, $66, $A0,$27,$22, $66 + .byte $A0,$27,$22, $66, $A0,$27,$22, $66, $A0,$54,$22, $52, $A0,$26,$22 + .byte $A3,$55, $66, $A0,$21,$22, $52, $22,$22, $A3,$62, $26 + .byte $AF,$22, $52, $A0,$61,$22 + .byte $A1 +laserg_01_rle: .byte $28 ; ysize=48 + .byte $A0,$2A,$AA, $0A, $00,$00, $A0,$25,$AA, $A3,$00, $0A, $A0,$25,$AA + .byte $A3,$00, $0A, $A0,$24,$AA, $A0,$01,$A0, $A3,$00, $A0,$25,$AA, $A0,$01,$A0 + .byte $00,$00, $0A, $A0,$25,$AA, $A3,$00, $0A, $A0,$25,$AA, $A3,$00 + .byte $A0,$25,$AA, $A0,$01,$A0, $00,$00, $0A, $A0,$25,$AA, $A3,$00, $0A + .byte $A0,$25,$AA, $A3,$00, $0A,$0A, $A0,$23,$AA, $A0,$01,$A0, $A4,$00, $0A + .byte $A0,$23,$AA, $A5,$00, $0A, $A0,$23,$AA, $A3,$00, $10, $00 + .byte $A3,$0A, $A0,$20,$AA, $A0,$01,$A0, $A3,$00, $10, $00, $A0,$01,$AA + .byte $A0,$01,$A0, $00, $A6,$AA, $0A,$0A, $A0,$18,$AA, $A0,$01,$A0, $A4,$00 + .byte $A0,$01,$A0, $A0,$01,$AA, $00, $A3,$AA, $0A, $A4,$00, $A0,$19,$AA + .byte $A0,$10,$00, $A0,$18,$AA, $A0,$01,$A0, $AF,$00, $0A, $A0,$18,$AA, $A0,$10,$00 + .byte $A0,$19,$AA, $AF,$00, $A0,$19,$AA, $A0,$01,$A0, $A5,$00, $A0,$01,$A0, $A0,$22,$AA + .byte $A5,$00, $A0,$24,$AA, $00, $01, $00,$00, $A0,$25,$AA, $A3,$00 + .byte $A0,$14,$AA + .byte $A1 +laserg_02_rle: .byte $28 ; ysize=48 + .byte $A0,$2A,$AA, $0A, $00,$00, $A0,$25,$AA, $A3,$00, $0A, $A0,$25,$AA + .byte $A3,$00, $0A, $A0,$24,$AA, $A0,$01,$A0, $A3,$00, $A0,$25,$AA, $A0,$01,$A0 + .byte $00,$00, $0A, $A0,$25,$AA, $A3,$00, $0A, $A0,$25,$AA, $A3,$00 + .byte $A0,$25,$AA, $A0,$01,$A0, $00,$00, $0A, $A0,$25,$AA, $A3,$00, $0A + .byte $A0,$25,$AA, $A3,$00, $0A,$0A, $A0,$23,$AA, $A0,$01,$A0, $A4,$00, $0A + .byte $A0,$23,$AA, $A5,$00, $0A, $A0,$23,$AA, $A3,$00, $10, $00 + .byte $A3,$0A, $A0,$20,$AA, $A0,$01,$A0, $A3,$00, $10, $00, $A0,$01,$AA + .byte $A0,$01,$A0, $00, $A6,$AA, $0A,$0A, $A0,$18,$AA, $A0,$01,$A0, $A4,$00 + .byte $A0,$01,$A0, $A0,$01,$AA, $00, $A3,$AA, $0A, $A4,$00, $A0,$19,$AA + .byte $A0,$10,$00, $A0,$18,$AA, $A0,$01,$A0, $AF,$00, $0A, $A0,$18,$AA, $A3,$00 + .byte $CC, $AC,$00, $A0,$19,$AA, $A3,$00, $CC, $AB,$00, $A0,$19,$AA + .byte $A0,$01,$A0, $A5,$00, $A0,$01,$A0, $A0,$22,$AA, $A5,$00, $A0,$24,$AA, $00 + .byte $01, $00,$00, $A0,$25,$AA, $A3,$00, $A0,$14,$AA + .byte $A1 +laserg_03_rle: .byte $28 ; ysize=48 + .byte $A0,$2A,$AA, $0A, $00,$00, $A0,$25,$AA, $A3,$00, $0A, $A0,$25,$AA + .byte $A3,$00, $0A, $A0,$24,$AA, $A0,$01,$A0, $A3,$00, $A0,$20,$AA, $BA + .byte $A4,$AA, $A0,$01,$A0, $00,$00, $0A, $A0,$1E,$AA, $BB,$BB, $A5,$AA + .byte $A3,$00, $0A, $A0,$1C,$AA, $A3,$BB, $A6,$AA, $A3,$00, $A0,$1A,$AA + .byte $BA, $A4,$BB, $A6,$AA, $A0,$01,$A0, $00,$00, $0A, $A0,$17,$AA + .byte $BA, $A6,$BB, $A7,$AA, $A3,$00, $0A, $A0,$15,$AA, $A8,$BB + .byte $A8,$AA, $A3,$00, $0A,$0A, $A0,$12,$AA, $A9,$BB, $A8,$AA, $A0,$01,$A0 + .byte $A4,$00, $0A, $A0,$10,$AA, $AA,$BB, $A9,$AA, $A5,$00, $0A + .byte $A0,$01,$AA, $BA, $3A, $BB,$BB, $BA, $BB, $A3,$BA + .byte $A4,$AA, $AB,$BB, $AA,$AA, $A3,$00, $10, $00, $0A + .byte $BB, $B3, $33, $A6,$BB, $A3,$BA, $AC,$BB, $AA,$AA + .byte $A0,$01,$A0, $A3,$00, $10, $00, $A0,$18,$BB, $AB,$AA, $A0,$01,$A0 + .byte $A4,$00, $A0,$01,$A0, $A0,$17,$BB, $AC,$AA, $A6,$00, $A0,$16,$BB, $AC,$AA + .byte $A0,$01,$A0, $A6,$00, $A0,$15,$BB, $AD,$AA, $A3,$00, $CC, $A3,$00 + .byte $A0,$13,$BB, $A0,$01,$AB, $AE,$AA, $A3,$00, $CC, $00,$00, $BB,$BB + .byte $33,$33, $03, $A4,$00, $A0,$01,$AA, $A7,$AB, $A0,$11,$AA, $A0,$01,$A0 + .byte $A5,$00, $BB, $A0,$01,$AB, $A0,$21,$AA, $A5,$00, $A0,$24,$AA, $00 + .byte $01, $00,$00, $A0,$25,$AA, $A3,$00, $A0,$14,$AA + .byte $A1 +laserg_04_rle: .byte $28 ; ysize=48 + .byte $A0,$02,$AA, $A3,$0A, $A0,$25,$AA, $A3,$00, $A0,$22,$AA, $BA, $A0,$02,$AA + .byte $A0,$01,$A0, $A3,$00, $A0,$21,$AA, $BB, $A3,$AA, $A0,$01,$A0, $00,$00 + .byte $0A, $A0,$1E,$AA, $BA, $BB, $0B, $A4,$AA, $A3,$00 + .byte $A0,$1D,$AA, $BA, $BB,$BB, $00, $A5,$AA, $A3,$00, $A0,$1A,$AA + .byte $BA, $A4,$BB, $00, $A5,$AA, $A3,$00, $0A, $A0,$17,$AA + .byte $BA, $A6,$BB, $00, $A6,$AA, $A3,$00, $A0,$16,$AA, $A8,$BB + .byte $00, $A7,$AA, $A3,$00, $A0,$14,$AA, $A9,$BB, $00, $A7,$AA + .byte $A0,$01,$A0, $A3,$00, $A0,$12,$AA, $AA,$BB, $00, $A8,$AA, $A5,$00 + .byte $0A, $A6,$AA, $BA, $A7,$AA, $AB,$BB, $00, $A8,$AA + .byte $A0,$01,$A0, $A5,$00, $A4,$AA, $BA, $A4,$BB, $A3,$BA, $AD,$BB + .byte $00, $A9,$AA, $A0,$01,$A0, $A5,$00, $A0,$01,$AA, $BA,$BA, $A0,$16,$BB + .byte $AA,$AA, $A5,$00, $A0,$19,$BB, $AB,$AA, $A5,$00, $A0,$18,$BB, $AB,$AA + .byte $A0,$01,$A0, $A5,$00, $A0,$17,$BB, $AC,$AA, $A6,$00, $A0,$16,$BB, $AD,$AA + .byte $A6,$00, $A6,$BB, $A5,$0B, $A6,$BB, $A0,$01,$AB, $A0,$10,$AA, $A0,$01,$A0 + .byte $A5,$00, $0B, $BB,$BB, $3B, $0B, $A6,$00, $A0,$18,$AA + .byte $A6,$00, $BB, $03,$03, $A7,$00, $A0,$19,$AA, $A5,$00, $A0,$01,$AB + .byte $A0,$22,$AA, $A0,$01,$A0, $A4,$00, $A0,$24,$AA, $A4,$00, $A0,$25,$AA, $00,$00 + .byte $A0,$15,$AA + .byte $A1 +laserg_05_rle: .byte $28 ; ysize=48 + .byte $A0,$77,$AA, $BB, $A0,$01,$AA, $A3,$00, $A0,$22,$AA, $BB,$BB, $A0,$01,$AA + .byte $A0,$01,$A0, $A3,$00, $A0,$1F,$AA, $BA, $A3,$BB, $A0,$02,$AA, $A3,$00 + .byte $A0,$1C,$AA, $BA, $A6,$BB, $A0,$02,$AA, $A0,$01,$A0, $A3,$00, $A0,$1A,$AA + .byte $BA, $A7,$BB, $A3,$AA, $A4,$00, $A0,$18,$AA, $BA, $A8,$BB + .byte $A4,$AA, $A4,$00, $A0,$16,$AA, $BA, $A9,$BB, $A5,$AA, $A4,$00 + .byte $0A, $A0,$13,$AA, $BA, $AA,$BB, $A5,$AA, $A0,$01,$A0, $A4,$00 + .byte $0A,$0A, $AF,$AA, $BA,$BA, $AB,$BB, $A6,$AA, $A7,$00, $0A + .byte $A3,$AA, $BA, $A0,$16,$BB, $A7,$AA, $A7,$00, $0A,$0A, $A0,$18,$BB + .byte $A8,$AA, $A6,$00, $0A, $A0,$01,$A0, $A0,$18,$BB, $A9,$AA, $A6,$00 + .byte $0A, $0B, $A0,$17,$BB, $AA,$AA, $A8,$00, $A0,$16,$BB, $AB,$AA + .byte $A8,$00, $0B, $A8,$BB, $A3,$0B, $A0,$02,$AB, $A3,$BB, $A4,$AB + .byte $AC,$AA, $A8,$00, $A5,$BB, $3B, $A5,$00, $A0,$15,$AA, $A0,$01,$A0 + .byte $A7,$00, $A4,$BB, $33, $A5,$00, $A0,$01,$A0, $A0,$16,$AA, $A0,$01,$A0 + .byte $A6,$00, $A3,$BB, $03, $A6,$00, $A0,$18,$AA, $A0,$01,$A0, $A5,$00 + .byte $BB,$BB, $A8,$A0, $A0,$19,$AA, $A6,$00, $A0,$01,$AB, $A0,$22,$AA, $A5,$00 + .byte $A0,$24,$AA, $A4,$00, $A0,$13,$AA + .byte $A1 +laserg_06_rle: .byte $28 ; ysize=48 + .byte $A0,$27,$AA, $BB, $A0,$26,$AA, $BB,$BB, $A0,$25,$AA, $A3,$BB, $A0,$01,$AA + .byte $A3,$0A, $A0,$20,$AA, $A4,$BB, $A0,$01,$AA, $A4,$00, $A0,$1E,$AA, $A5,$BB + .byte $A0,$01,$AA, $A0,$01,$A0, $A4,$00, $A0,$1B,$AA, $BA, $A6,$BB, $A0,$02,$AA + .byte $A0,$01,$A0, $A4,$00, $0A, $A0,$18,$AA, $A8,$BB, $A3,$AA, $A0,$01,$A0 + .byte $A4,$00, $0A, $A0,$15,$AA, $BA, $A9,$BB, $A4,$AA, $A0,$01,$A0 + .byte $A4,$00, $A4,$0A, $A8,$AA, $A8,$BA, $AB,$BB, $A6,$AA, $A8,$00 + .byte $A6,$AA, $A0,$14,$BB, $A7,$AA, $A8,$00, $0A, $A0,$18,$BB, $A8,$AA + .byte $A8,$00, $A3,$0B, $A0,$15,$BB, $A4,$AA, $A3,$0A, $A0,$01,$AA, $A0,$01,$A0 + .byte $AA,$00, $0B, $A0,$14,$BB, $A4,$AA, $A4,$00, $A0,$02,$AA, $AA,$00 + .byte $0B, $AB,$BB, $0B, $A7,$AB, $A4,$AA, $A0,$01,$A0, $A3,$00 + .byte $0A, $A0,$02,$AA, $A6,$00, $CC, $A3,$00, $A9,$BB, $0B,$0B + .byte $00, $AC,$AA, $A0,$01,$A0, $A4,$00, $A0,$02,$AA, $A0,$01,$A0, $A8,$00 + .byte $A7,$BB, $0B, $A4,$00, $AD,$AA, $A0,$01,$A0, $A4,$00, $A0,$02,$AA + .byte $A8,$00, $A6,$BB, $A0,$01,$AB, $A0,$13,$AA, $A0,$01,$A0, $A4,$00, $0A,$0A + .byte $A7,$00, $A3,$BB, $A3,$AB, $A0,$16,$AA, $AC,$00, $BB, $A0,$01,$AB + .byte $A0,$1B,$AA, $AA,$00, $A0,$01,$A0, $A0,$1E,$AA, $A9,$00, $A0,$20,$AA, $A8,$00 + .byte $AC,$0A, $A0,$15,$AA, $A0,$14,$00, $A0,$15,$AA, $A0,$13,$00, $A7,$AA + .byte $A1 +laserg_07_rle: .byte $28 ; ysize=48 + .byte $A0,$26,$AA, $BB,$BB, $A0,$24,$AA, $BA, $A3,$BB, $A0,$18,$AA, $A3,$BA + .byte $A8,$AA, $BA, $A4,$BB, $A0,$12,$AA, $A9,$BB, $A3,$BA, $A3,$AA + .byte $BA, $A6,$BB, $A4,$00, $0A,$0A, $AC,$AA, $A0,$16,$BB, $A9,$00 + .byte $0A,$0A, $A6,$AA, $A0,$17,$BB, $A0,$01,$A0, $AD,$00, $A3,$0A, $A0,$17,$BB + .byte $A3,$AA, $A0,$01,$A0, $AF,$00, $0B,$0B, $A0,$13,$BB, $A5,$AA, $A0,$02,$A0 + .byte $AF,$00, $A0,$12,$BB, $A8,$AA, $A0,$01,$A0, $AD,$00, $A0,$10,$BB, $A0,$02,$AB + .byte $AB,$AA, $A0,$01,$A0, $AA,$00, $AC,$BB, $0B, $A3,$00, $AF,$AA + .byte $A0,$02,$A0, $A7,$00, $AA,$BB, $0B, $A4,$00, $A0,$13,$AA, $A0,$02,$A0 + .byte $A3,$00, $B0, $A8,$BB, $0B, $A6,$00, $A0,$17,$AA, $A8,$BB + .byte $A0,$01,$AB, $A0,$1E,$AA, $BA, $A6,$BB, $A0,$02,$AB, $A0,$1F,$AA, $A4,$BB + .byte $A0,$25,$AA, $A0,$02,$AB, $A0,$FF,$AA, $A7,$AA, $00,$00, $A4,$0A, $A0,$1E,$AA + .byte $A1 +laserg_08_rle: .byte $28 ; ysize=48 + .byte $A0,$02,$AA, $A3,$A0, $A0,$12,$00, $A0,$11,$BB, $A7,$AA, $A4,$A0, $AA,$00 + .byte $B0,$B0, $A0,$11,$BB, $A0,$11,$AA, $A0,$01,$A0, $B0, $A0,$15,$BB, $A0,$10,$AA + .byte $BA, $A0,$17,$BB, $A0,$10,$AA, $A0,$01,$AB, $A0,$15,$BB, $0B, $00 + .byte $A0,$11,$AA, $AE,$BB, $A3,$0B, $A6,$00, $A0,$12,$AA, $A3,$AB, $A4,$AA + .byte $A4,$AB, $AB,$00, $A0,$1E,$AA, $A0,$02,$A0, $A8,$00, $A0,$22,$AA, $A0,$02,$A0 + .byte $A4,$00, $A0,$26,$AA, $A0,$02,$A0, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$32,$AA + .byte $A1 +laserg_blank_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$C3,$AA + .byte $A1