From 1c01a15b8a9b3ac97d582e6df78510b4cddc3f4c Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 22 Mar 2021 23:02:27 -0400 Subject: [PATCH] ootw: intro: split off soda --- games/ootw/intro/Makefile | 1 + games/ootw/intro/graphics/07_soda/Makefile | 58 ----------- games/ootw/intro/intro.s | 69 +------------- games/ootw/intro/intro_07_soda.s | 106 +++++++++++++++++++++ games/ootw/intro/intro_data_06.s | 34 ------- 5 files changed, 111 insertions(+), 157 deletions(-) create mode 100644 games/ootw/intro/intro_07_soda.s delete mode 100644 games/ootw/intro/intro_data_06.s diff --git a/games/ootw/intro/Makefile b/games/ootw/intro/Makefile index a78fa95f..d5ba9b9f 100644 --- a/games/ootw/intro/Makefile +++ b/games/ootw/intro/Makefile @@ -28,6 +28,7 @@ intro.o: intro.s \ intro_04_keypad.s \ intro_05_scanner.s \ intro_06_console.s \ + intro_07_soda.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/07_soda/Makefile b/games/ootw/intro/graphics/07_soda/Makefile index 3e308cde..8a2aa867 100644 --- a/games/ootw/intro/graphics/07_soda/Makefile +++ b/games/ootw/intro/graphics/07_soda/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 @@ -44,62 +42,6 @@ intro_drinking.inc: \ %.lzsa: %.gr $(LZSA) -r -f2 $< $@ - - -#intro_open_soda.inc: $(PNG2RLE) soda_bg.png \ -# soda01.png soda02.png soda03.png \ -# soda04.png soda05.png soda06.png \ -# soda07.png soda08.png soda09.png -# $(PNG2RLE) asm soda_bg.png soda_bg_rle > intro_open_soda.inc -# $(PNG2RLE) asm soda01.png soda01_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda02.png soda02_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda03.png soda03_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda04.png soda04_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda05.png soda05_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda06.png soda06_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda07.png soda07_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda08.png soda08_rle >> intro_open_soda.inc -# $(PNG2RLE) asm soda09.png soda09_rle >> intro_open_soda.inc - -##### - - -#intro_drinking.inc: $(PNG2RLE) \ -# drinking02.png drinking03.png drinking04.png drinking05.png -# $(PNG2RLE) asm drinking02.png drinking02_rle >> intro_drinking.inc -# $(PNG2RLE) asm drinking03.png drinking03_rle >> intro_drinking.inc -# $(PNG2RLE) asm drinking04.png drinking04_rle >> intro_drinking.inc -# $(PNG2RLE) asm drinking05.png drinking05_rle >> intro_drinking.inc - - -##### - -#intro_open_soda_lz4.inc: $(PNG2LZ4) soda_bg.png \ -# soda01.png soda02.png soda03.png \ -# soda04.png soda05.png soda06.png \ -# soda07.png soda08.png soda09.png -# $(PNG2LZ4) asm soda_bg.png soda_bg_rle > intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda01.png soda01_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda02.png soda02_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda03.png soda03_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda04.png soda04_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda05.png soda05_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda06.png soda06_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda07.png soda07_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda08.png soda08_rle >> intro_open_soda_lz4.inc -# $(PNG2LZ4) asm soda09.png soda09_rle >> intro_open_soda_lz4.inc - -##### - - -#intro_drinking_lz4.inc: $(PNG2LZ4) \ -# drinking02.png drinking03.png drinking04.png drinking05.png -# $(PNG2LZ4) asm drinking02.png drinking02_rle >> intro_drinking_lz4.inc -# $(PNG2LZ4) asm drinking03.png drinking03_rle >> intro_drinking_lz4.inc -# $(PNG2LZ4) asm drinking04.png drinking04_rle >> intro_drinking_lz4.inc -# $(PNG2LZ4) asm drinking05.png drinking05_rle >> intro_drinking_lz4.inc - - ##### clean: diff --git a/games/ootw/intro/intro.s b/games/ootw/intro/intro.s index 5197d46a..9965f573 100644 --- a/games/ootw/intro/intro.s +++ b/games/ootw/intro/intro.s @@ -58,67 +58,10 @@ repeat_intro: jsr intro_06_console_part1 -;=============================== -;=============================== -; Opening Soda -;=============================== -;=============================== -soda: - lda #<(soda_bg_lzsa) - sta getsrc_smc+1 ; LZSA_SRC_LO - lda #>(soda_bg_lzsa) - sta getsrc_smc+2 ; LZSA_SRC_HI - - lda #$c ; load to off-screen $c00 - jsr decompress_lzsa2_fast - - bit FULLGR - - lda #soda_sequence - sta INTRO_LOOPH - - jsr run_sequence - - -; ldx #30 -; jsr long_wait - -;open_soda_loop: -; lda KEYPRESS -; bpl open_soda_loop -; bit KEYRESET - -;=============================== -;=============================== -; Drinking Soda -;=============================== -;=============================== - - lda #<(drinking02_lzsa) - sta getsrc_smc+1 ; LZSA_SRC_LO - lda #>(drinking02_lzsa) - sta getsrc_smc+2 ; LZSA_SRC_HI - - lda #$c ; load to off-screen $c00 - jsr decompress_lzsa2_fast - - lda #drinking_sequence - sta INTRO_LOOPH - - jsr run_sequence - - ldx #200 - jsr long_wait - -;drinking_loop: -; lda KEYPRESS -; bpl drinking_loop -; bit KEYRESET + ;=============================== + ; Drinking some Soda + jsr intro_07_soda ;=============================== ; Nuclear Physics, part 2 @@ -345,11 +288,6 @@ done_intro: DATA_LOCATION = $9000 - -intro6_data_lzsa: -; .incbin "intro_data_06.lzsa" - .include "intro_data_06.s" - ; intro8 .if 0 bolt_sequence = (DATA_LOCATION+$1484) @@ -387,3 +325,4 @@ intro9_data_lzsa: .include "intro_04_keypad.s" .include "intro_05_scanner.s" .include "intro_06_console.s" + .include "intro_07_soda.s" diff --git a/games/ootw/intro/intro_07_soda.s b/games/ootw/intro/intro_07_soda.s new file mode 100644 index 00000000..fcabf8e1 --- /dev/null +++ b/games/ootw/intro/intro_07_soda.s @@ -0,0 +1,106 @@ +;=================================== +; OOTW -- Intro -- Refreshing Pause +;=================================== + +intro_07_soda: + +;=============================== +;=============================== +; Opening Soda +;=============================== +;=============================== +soda: + lda #<(soda_bg_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(soda_bg_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI + + lda #$c ; load to off-screen $c00 + jsr decompress_lzsa2_fast + + bit FULLGR + + lda #soda_sequence + sta INTRO_LOOPH + + jsr run_sequence + + +; ldx #30 +; jsr long_wait + +;open_soda_loop: +; lda KEYPRESS +; bpl open_soda_loop +; bit KEYRESET + +;=============================== +;=============================== +; Drinking Soda +;=============================== +;=============================== + + lda #<(drinking02_lzsa) + sta getsrc_smc+1 ; LZSA_SRC_LO + lda #>(drinking02_lzsa) + sta getsrc_smc+2 ; LZSA_SRC_HI + + lda #$c ; load to off-screen $c00 + jsr decompress_lzsa2_fast + + lda #drinking_sequence + sta INTRO_LOOPH + + jsr run_sequence + + ldx #200 + jsr long_wait + +;drinking_loop: +; lda KEYPRESS +; bpl drinking_loop +; bit KEYRESET + + + rts + + + +;================================= +;================================= +; Intro Segment 07 Data (Soda) +;================================= +;================================= + +.include "graphics/07_soda/intro_open_soda.inc" +.include "graphics/07_soda/intro_drinking.inc" + +; Soda sequence + +soda_sequence: + .byte 1 + .word soda01_lzsa + .byte 128+30 ; .word soda02_lzsa + .byte 128+15 ; .word soda03_lzsa + .byte 128+15 ; .word soda04_lzsa + .byte 128+15 ; .word soda05_lzsa + .byte 128+15 ; .word soda06_lzsa + .byte 128+15 ; .word soda07_lzsa + .byte 128+15 ; .word soda08_lzsa + .byte 128+15 ; .word soda09_lzsa + .byte 20 + .word soda09_lzsa + .byte 0 + + +drinking_sequence: + .byte 30 + .word drinking02_lzsa + .byte 128+30 ; .word drinking03_lzsa + .byte 128+30 ; .word drinking04_lzsa + .byte 128+30 ; .word drinking05_lzsa + .byte 0 diff --git a/games/ootw/intro/intro_data_06.s b/games/ootw/intro/intro_data_06.s deleted file mode 100644 index 46a89064..00000000 --- a/games/ootw/intro/intro_data_06.s +++ /dev/null @@ -1,34 +0,0 @@ -;================================= -;================================= -; Intro Segment 07 Data (Soda) -;================================= -;================================= - -.include "graphics/07_soda/intro_open_soda.inc" -.include "graphics/07_soda/intro_drinking.inc" - -; Soda sequence - -soda_sequence: - .byte 1 - .word soda01_lzsa - .byte 128+30 ; .word soda02_lzsa - .byte 128+15 ; .word soda03_lzsa - .byte 128+15 ; .word soda04_lzsa - .byte 128+15 ; .word soda05_lzsa - .byte 128+15 ; .word soda06_lzsa - .byte 128+15 ; .word soda07_lzsa - .byte 128+15 ; .word soda08_lzsa - .byte 128+15 ; .word soda09_lzsa - .byte 20 - .word soda09_lzsa - .byte 0 - - -drinking_sequence: - .byte 30 - .word drinking02_lzsa - .byte 128+30 ; .word drinking03_lzsa - .byte 128+30 ; .word drinking04_lzsa - .byte 128+30 ; .word drinking05_lzsa - .byte 0