ootw: intro: split off soda
This commit is contained in:
Vince Weaver
parent
f042f3ba6d
commit
1c01a15b8a
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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_LOOPL
|
||||
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_LOOPL
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -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_LOOPL
|
||||
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_LOOPL
|
||||
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
|
||||
|
|
@ -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
|
||||
Loading…
Reference in New Issue