From a802ce050f4e326933c20146e6093d4cbb12e493 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 22 Mar 2021 23:12:51 -0400 Subject: [PATCH] ootw: intro: break off tunnel --- games/ootw/intro/Makefile | 1 + games/ootw/intro/graphics/09_tunnel/Makefile | 123 -------------- games/ootw/intro/intro.s | 72 +------- games/ootw/intro/intro_09_tunnel.s | 167 +++++++++++++++++++ games/ootw/intro/intro_data_09.s | 90 ---------- 5 files changed, 172 insertions(+), 281 deletions(-) create mode 100644 games/ootw/intro/intro_09_tunnel.s diff --git a/games/ootw/intro/Makefile b/games/ootw/intro/Makefile index 503d1d86..888ed5b7 100644 --- a/games/ootw/intro/Makefile +++ b/games/ootw/intro/Makefile @@ -30,6 +30,7 @@ intro.o: intro.s \ intro_06_console.s \ intro_07_soda.s \ intro_08_lightning.s \ + intro_09_tunnel.s \ graphics/01_building/intro_car.inc \ graphics/01_building/intro_building.inc \ graphics/01_building/intro_building_car.inc \ diff --git a/games/ootw/intro/graphics/09_tunnel/Makefile b/games/ootw/intro/graphics/09_tunnel/Makefile index 5f69d9a3..78976907 100644 --- a/games/ootw/intro/graphics/09_tunnel/Makefile +++ b/games/ootw/intro/graphics/09_tunnel/Makefile @@ -1,7 +1,5 @@ include ../../../../../Makefile.inc -#PNG2RLE = ../../../gr-utils/png2rle -#PNG2LZ4 = ../../../gr-utils/png2lz4 PNG2GR = ../../../../../utils/gr-utils/png2gr LZSA = ~/research/lzsa/lzsa/lzsa @@ -73,127 +71,6 @@ intro_tunnel2.inc: \ %.lzsa: %.gr $(LZSA) -r -f2 $< $@ - -##### -# -#intro_tunnel1.inc: $(PNG2RLE) \ -# intro_tunnel1.png \ -# tunnel1_01.png tunnel1_02.png tunnel1_03.png tunnel1_04.png \ -# tunnel1_05.png tunnel1_06.png tunnel1_07.png tunnel1_08.png \ -# tunnel1_09.png tunnel1_10.png tunnel1_11.png tunnel1_12.png \ -# tunnel1_13.png tunnel1_14.png tunnel1_15.png tunnel1_16.png \ -# tunnel1_17.png tunnel1_18.png tunnel1_19.png -# $(PNG2RLE) asm intro_tunnel1.png tunnel1_rle > intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_01.png tunnel1_01_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_02.png tunnel1_02_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_03.png tunnel1_03_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_04.png tunnel1_04_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_05.png tunnel1_05_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_06.png tunnel1_06_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_07.png tunnel1_07_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_08.png tunnel1_08_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_09.png tunnel1_09_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_10.png tunnel1_10_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_11.png tunnel1_11_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_12.png tunnel1_12_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_13.png tunnel1_13_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_14.png tunnel1_14_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_15.png tunnel1_15_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_16.png tunnel1_16_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_17.png tunnel1_17_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_18.png tunnel1_18_rle >> intro_tunnel1.inc -# $(PNG2RLE) asm tunnel1_19.png tunnel1_19_rle >> intro_tunnel1.inc - -##### - -#intro_tunnel2.inc: $(PNG2RLE) \ -# intro_tunnel2.png \ -# tunnel2_01.png tunnel2_02.png tunnel2_03.png tunnel2_04.png \ -# tunnel2_05.png tunnel2_06.png tunnel2_07.png tunnel2_08.png \ -# tunnel2_09.png tunnel2_10.png tunnel2_11.png tunnel2_12.png \ -# tunnel2_13.png tunnel2_14.png tunnel2_15.png tunnel2_16.png \ -# tunnel2_17.png -# $(PNG2RLE) asm intro_tunnel2.png tunnel2_rle > intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_01.png tunnel2_01_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_02.png tunnel2_02_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_03.png tunnel2_03_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_04.png tunnel2_04_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_05.png tunnel2_05_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_06.png tunnel2_06_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_07.png tunnel2_07_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_08.png tunnel2_08_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_09.png tunnel2_09_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_10.png tunnel2_10_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_11.png tunnel2_11_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_12.png tunnel2_12_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_13.png tunnel2_13_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_14.png tunnel2_14_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_15.png tunnel2_15_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_16.png tunnel2_16_rle >> intro_tunnel2.inc -# $(PNG2RLE) asm tunnel2_17.png tunnel2_17_rle >> intro_tunnel2.inc - - -##### -##### - -#intro_tunnel1_lz4.inc: $(PNG2LZ4) \ -# intro_tunnel1.png \ -# tunnel1_01.png tunnel1_02.png tunnel1_03.png tunnel1_04.png \ -# tunnel1_05.png tunnel1_06.png tunnel1_07.png tunnel1_08.png \ -# tunnel1_09.png tunnel1_10.png tunnel1_11.png tunnel1_12.png \ -# tunnel1_13.png tunnel1_14.png tunnel1_15.png tunnel1_16.png \ -# tunnel1_17.png tunnel1_18.png tunnel1_19.png -# $(PNG2LZ4) asm intro_tunnel1.png tunnel1_rle > intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_01.png tunnel1_01_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_02.png tunnel1_02_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_03.png tunnel1_03_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_04.png tunnel1_04_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_05.png tunnel1_05_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_06.png tunnel1_06_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_07.png tunnel1_07_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_08.png tunnel1_08_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_09.png tunnel1_09_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_10.png tunnel1_10_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_11.png tunnel1_11_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_12.png tunnel1_12_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_13.png tunnel1_13_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_14.png tunnel1_14_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_15.png tunnel1_15_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_16.png tunnel1_16_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_17.png tunnel1_17_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_18.png tunnel1_18_rle >> intro_tunnel1_lz4.inc -# $(PNG2LZ4) asm tunnel1_19.png tunnel1_19_rle >> intro_tunnel1_lz4.inc -# -##### - -#intro_tunnel2_lz4.inc: $(PNG2LZ4) \ -# intro_tunnel2.png \ -# tunnel2_01.png tunnel2_02.png tunnel2_03.png tunnel2_04.png \ -# tunnel2_05.png tunnel2_06.png tunnel2_07.png tunnel2_08.png \ -# tunnel2_09.png tunnel2_10.png tunnel2_11.png tunnel2_12.png \ -# tunnel2_13.png tunnel2_14.png tunnel2_15.png tunnel2_16.png \ -# tunnel2_17.png -# $(PNG2LZ4) asm intro_tunnel2.png tunnel2_rle > intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_01.png tunnel2_01_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_02.png tunnel2_02_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_03.png tunnel2_03_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_04.png tunnel2_04_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_05.png tunnel2_05_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_06.png tunnel2_06_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_07.png tunnel2_07_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_08.png tunnel2_08_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_09.png tunnel2_09_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_10.png tunnel2_10_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_11.png tunnel2_11_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_12.png tunnel2_12_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_13.png tunnel2_13_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_14.png tunnel2_14_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_15.png tunnel2_15_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_16.png tunnel2_16_rle >> intro_tunnel2_lz4.inc -# $(PNG2LZ4) asm tunnel2_17.png tunnel2_17_rle >> intro_tunnel2_lz4.inc - - - ##### clean: diff --git a/games/ootw/intro/intro.s b/games/ootw/intro/intro.s index 1038f70a..62a9d947 100644 --- a/games/ootw/intro/intro.s +++ b/games/ootw/intro/intro.s @@ -73,75 +73,10 @@ repeat_intro: jsr intro_08_lightning + ;=============================== + ; Down in the tunnels -;=============================== -;=============================== -; Tunnel 1 -;=============================== -;=============================== - -tunnel1: - - lda #<(tunnel1_lzsa) - sta getsrc_smc+1 ; LZSA_SRC_LO - lda #>(tunnel1_lzsa) - sta getsrc_smc+2 ; LZSA_SRC_HI - - lda #$c ; load to off-screen $c00 - jsr decompress_lzsa2_fast - - jsr gr_copy_to_current - jsr page_flip - - lda #tunnel1_sequence - sta INTRO_LOOPH - - jsr run_sequence - - -;tunnel1_loop: -; lda KEYPRESS -; bpl tunnel1_loop -; bit KEYRESET - - - -;=============================== -;=============================== -; Tunnel 2 -;=============================== -;=============================== - - - ;============================= - ; Load background to $c00 - - lda #<(tunnel2_lzsa) - sta getsrc_smc+1 ; LZSA_SRC_LO - lda #>(tunnel2_lzsa) - sta getsrc_smc+2 ; LZSA_SRC_HI - - lda #$c ; load to off-screen $c00 - jsr decompress_lzsa2_fast - - jsr gr_copy_to_current - jsr page_flip - - lda #tunnel2_sequence - sta INTRO_LOOPH - - jsr run_sequence - - -;tunnel2_loop: -; lda KEYPRESS -; bpl tunnel2_loop -; bit KEYRESET - + jsr intro_09_tunnel ;=============================== @@ -266,3 +201,4 @@ done_intro: .include "intro_06_console.s" .include "intro_07_soda.s" .include "intro_08_lightning.s" + .include "intro_09_tunnel.s" diff --git a/games/ootw/intro/intro_09_tunnel.s b/games/ootw/intro/intro_09_tunnel.s new file mode 100644 index 00000000..e7f06ea2 --- /dev/null +++ b/games/ootw/intro/intro_09_tunnel.s @@ -0,0 +1,167 @@ +;========================================= +; OOTW -- Intro -- Down in the Accelerator +;========================================= + +intro_09_tunnel: + +;=============================== +;=============================== +; Tunnel 1 +;=============================== +;=============================== + +tunnel1: + + lda #<(tunnel1_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(tunnel1_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI + + lda #$c ; load to off-screen $c00 + jsr decompress_lzsa2_fast + + jsr gr_copy_to_current + jsr page_flip + + lda #tunnel1_sequence + sta INTRO_LOOPH + + jsr run_sequence + + +;tunnel1_loop: +; lda KEYPRESS +; bpl tunnel1_loop +; bit KEYRESET + + + +;=============================== +;=============================== +; Tunnel 2 +;=============================== +;=============================== + + + ;============================= + ; Load background to $c00 + + lda #<(tunnel2_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(tunnel2_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI + + lda #$c ; load to off-screen $c00 + jsr decompress_lzsa2_fast + + jsr gr_copy_to_current + jsr page_flip + + lda #tunnel2_sequence + sta INTRO_LOOPH + + jsr run_sequence + + +;tunnel2_loop: +; lda KEYPRESS +; bpl tunnel2_loop +; bit KEYRESET + + rts + + + +;================================= +;================================= +; Intro Segment 09 Data (Tunnel) +;================================= +;================================= + + + +; background graphics + +.include "graphics/09_tunnel/intro_tunnel1.inc" +.include "graphics/09_tunnel/intro_tunnel2.inc" +;.include "graphics/08_lightning/nothing.inc" +;.include "graphics/08_lightning/whiteblack.inc" + + ;======================= + ; Tunnel1 Sequence + ;======================= +tunnel1_sequence: + .byte 10 + .word nothing_lzsa + .byte 50 + ; red blob + .word tunnel1_01_lzsa + .byte 128+2 ; .word tunnel1_02_lzsa + .byte 128+2 ; .word tunnel1_03_lzsa + .byte 128+2 ; .word tunnel1_04_lzsa + .byte 128+2 ; .word tunnel1_05_lzsa + .byte 2 + + ; lightning blob + .word nothing_lzsa + .byte 50 + .word tunnel1_06_lzsa + .byte 128+2 ; .word tunnel1_07_lzsa + .byte 2 + .word white_lzsa + .byte 2 + .word tunnel1_08_lzsa + .byte 128+2 ; .word tunnel1_09_lzsa + .byte 128+2 ; .word tunnel1_10_lzsa + .byte 128+2 ; .word tunnel1_11_lzsa + .byte 128+2 ; .word tunnel1_12_lzsa + .byte 128+2 ; .word tunnel1_13_lzsa + .byte 128+2 ; .word tunnel1_14_lzsa + .byte 128+2 ; .word tunnel1_15_lzsa + .byte 128+2 ; .word tunnel1_16_lzsa + .byte 128+2 ; .word tunnel1_17_lzsa + .byte 128+2 ; .word tunnel1_18_lzsa + .byte 128+2 ; .word tunnel1_19_lzsa + .byte 2 + .word nothing_lzsa + .byte 0 + + + ;======================= + ; Tunnel2 Sequence + ;======================= +tunnel2_sequence: + .byte 10 + .word nothing_lzsa + .byte 50 + ; red blob + .word tunnel2_01_lzsa + .byte 128+2 ; .word tunnel2_02_lzsa + .byte 128+2 ; .word tunnel2_03_lzsa + .byte 128+2 ; .word tunnel2_04_lzsa + .byte 128+2 ; .word tunnel2_05_lzsa + .byte 128+2 ; .word tunnel2_06_lzsa + .byte 128+2 ; .word tunnel2_07_lzsa + .byte 128+2 ; .word tunnel2_08_lzsa + .byte 128+2 ; .word tunnel2_09_lzsa + .byte 2 + .word nothing_lzsa + .byte 50 + + ; lightning blob + .word tunnel2_10_lzsa + .byte 128+2 ; .word tunnel2_11_lzsa + .byte 128+2 ; .word tunnel2_12_lzsa + .byte 128+2 ; .word tunnel2_13_lzsa + .byte 128+2 ; .word tunnel2_14_lzsa + .byte 128+2 ; .word tunnel2_15_lzsa + .byte 128+2 ; .word tunnel2_16_lzsa + .byte 128+2 ; .word tunnel2_17_lzsa + .byte 2 + .word nothing_lzsa + .byte 0 + diff --git a/games/ootw/intro/intro_data_09.s b/games/ootw/intro/intro_data_09.s index 8452de96..c98e0640 100644 --- a/games/ootw/intro/intro_data_09.s +++ b/games/ootw/intro/intro_data_09.s @@ -1,93 +1,3 @@ -;================================= -;================================= -; Intro Segment 09 Data (Tunnel) -;================================= -;================================= - - - -; background graphics - -.include "graphics/09_tunnel/intro_tunnel1.inc" -.include "graphics/09_tunnel/intro_tunnel2.inc" -;.include "graphics/08_lightning/nothing.inc" -;.include "graphics/08_lightning/whiteblack.inc" - - ;======================= - ; Tunnel1 Sequence - ;======================= -tunnel1_sequence: - .byte 10 - .word nothing_lzsa - .byte 50 - ; red blob - .word tunnel1_01_lzsa - .byte 128+2 ; .word tunnel1_02_lzsa - .byte 128+2 ; .word tunnel1_03_lzsa - .byte 128+2 ; .word tunnel1_04_lzsa - .byte 128+2 ; .word tunnel1_05_lzsa - .byte 2 - - ; lightning blob - .word nothing_lzsa - .byte 50 - .word tunnel1_06_lzsa - .byte 128+2 ; .word tunnel1_07_lzsa - .byte 2 - .word white_lzsa - .byte 2 - .word tunnel1_08_lzsa - .byte 128+2 ; .word tunnel1_09_lzsa - .byte 128+2 ; .word tunnel1_10_lzsa - .byte 128+2 ; .word tunnel1_11_lzsa - .byte 128+2 ; .word tunnel1_12_lzsa - .byte 128+2 ; .word tunnel1_13_lzsa - .byte 128+2 ; .word tunnel1_14_lzsa - .byte 128+2 ; .word tunnel1_15_lzsa - .byte 128+2 ; .word tunnel1_16_lzsa - .byte 128+2 ; .word tunnel1_17_lzsa - .byte 128+2 ; .word tunnel1_18_lzsa - .byte 128+2 ; .word tunnel1_19_lzsa - .byte 2 - .word nothing_lzsa - .byte 0 - - - ;======================= - ; Tunnel2 Sequence - ;======================= -tunnel2_sequence: - .byte 10 - .word nothing_lzsa - .byte 50 - ; red blob - .word tunnel2_01_lzsa - .byte 128+2 ; .word tunnel2_02_lzsa - .byte 128+2 ; .word tunnel2_03_lzsa - .byte 128+2 ; .word tunnel2_04_lzsa - .byte 128+2 ; .word tunnel2_05_lzsa - .byte 128+2 ; .word tunnel2_06_lzsa - .byte 128+2 ; .word tunnel2_07_lzsa - .byte 128+2 ; .word tunnel2_08_lzsa - .byte 128+2 ; .word tunnel2_09_lzsa - .byte 2 - .word nothing_lzsa - .byte 50 - - ; lightning blob - .word tunnel2_10_lzsa - .byte 128+2 ; .word tunnel2_11_lzsa - .byte 128+2 ; .word tunnel2_12_lzsa - .byte 128+2 ; .word tunnel2_13_lzsa - .byte 128+2 ; .word tunnel2_14_lzsa - .byte 128+2 ; .word tunnel2_15_lzsa - .byte 128+2 ; .word tunnel2_16_lzsa - .byte 128+2 ; .word tunnel2_17_lzsa - .byte 2 - .word nothing_lzsa - .byte 0 - - ;================================= ;=================================