ootw_intro: up to #4

deater · Mar 2, 2019 · 59e0351 · 59e0351
1 parent f21a8b8
commit 59e0351
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 7 deletions.
diff --git a/ootw/Makefile b/ootw/Makefile
@@ -92,13 +92,12 @@ intro.o:	intro.s \
 	intro_graphics/09_tunnel/intro_tunnel2.inc \
 	intro_graphics/10_gone/intro_zappo.inc \
 	intro_graphics/10_gone/intro_gone.inc \
-	intro_data_01.lz4
+	intro_data_01.lz4 \
+	intro_data_04.lz4
 	ca65 -o intro.o intro.s -l intro.lst
 
 ####
 
-
-
 intro_data_01.lz4:	intro_data_01
 	lz4 -f -16 intro_data_01
 	truncate -s-8 intro_data_01.lz4
@@ -109,6 +108,18 @@ intro_data_01:	intro_data_01.o
 intro_data_01.o:	intro_data_01.s
 	ca65 -o intro_data_01.o intro_data_01.s -l intro_data_01.lst
 
+
+intro_data_04.lz4:	intro_data_04
+	lz4 -f -16 intro_data_04
+	truncate -s-8 intro_data_04.lz4
+
+intro_data_04:	intro_data_04.o
+	ld65 -o intro_data_04 intro_data_04.o -C ../linker_scripts/apple2_9000.inc
+
+intro_data_04.o:	intro_data_04.s
+	ca65 -o intro_data_04.o intro_data_04.s -l intro_data_04.lst
+
+
 ####
 
 LOADER:	loader.o

diff --git a/ootw/intro.s b/ootw/intro.s
@@ -509,10 +509,19 @@ elevator_inner_loop:
 ;===============================
 ;===============================
 
+keypad:
+	;==================================
+	; Uncompress the data
+	;==================================
+	lda	#<intro4_data_lz4
+	sta	LZ4_SRC
+	lda	#>intro4_data_lz4
+	sta	LZ4_SRC+1
 
-.if 0
+	lda	#$90		; load to $9000
+
+	jsr	lz4_decode
 
-keypad:
 	;=============================
 	; Load background to $c00
 
@@ -570,7 +579,7 @@ keypad:
 
 	jsr	run_sequence
 
-
+.if 0
 ;===============================
 ;===============================
 ; Scanner
@@ -1949,3 +1958,20 @@ intro1_data_lz4:
 	.word (intro1_data_lz4_end-intro1_data_lz4)
 	.incbin "intro_data_01.lz4",11
 intro1_data_lz4_end:
+
+; intro4
+
+opening_sequence  =	(DATA_LOCATION+$2051)
+keypad_sequence   =	(DATA_LOCATION+$1FF6)
+keypad_rle        =	(DATA_LOCATION+$0496)
+approach_sequence =	(DATA_LOCATION+$1FE9)
+scanner_door_rle  =	(DATA_LOCATION+$0000)
+
+intro4_data_lz4:
+	.word (intro4_data_lz4_end-intro4_data_lz4)
+	.incbin "intro_data_04.lz4",11
+intro4_data_lz4_end:
+
+
+
+
diff --git a/ootw/intro_data_04.s b/ootw/intro_data_04.s
@@ -1,11 +1,16 @@
-; background graphics
+;=================================
+;=================================
+; Intro Segment 01 Data (Building)
+;=================================
+;=================================
 
 .include "intro_graphics/04_keypad/intro_scanner_door.inc"
 .include "intro_graphics/04_keypad/intro_approach.inc"
 .include "intro_graphics/04_keypad/intro_keypad_bg.inc"
 .include "intro_graphics/04_keypad/intro_hands.inc"
 .include "intro_graphics/04_keypad/intro_opening.inc"
 
+.include "intro_graphics/08_lightning/nothing.inc"
 
 ; Approaching keypad sequence