ootw: start animating the keypad

ootw/Makefile

@@ -67,8 +67,9 @@ intro.o:	intro.s \
 	intro_graphics/03_elevator/intro_off_elevator.inc \
 	intro_graphics/03_elevator/intro_walking.inc \
 	intro_graphics/04_keypad/intro_scanner_door.inc \
-	intro_graphics/04_keypad/intro_keypad.inc \
-	intro_graphics/04_keypad/intro_approach.inc
+	intro_graphics/04_keypad/intro_approach.inc \
+	intro_graphics/04_keypad/intro_keypad_bg.inc \
+	intro_graphics/04_keypad/intro_hands.inc
 	ca65 -o intro.o intro.s -l intro.lst
 
 ####

ootw/intro.s

@@ -21,7 +21,7 @@ intro:
 	lda	#0
 	sta	DISP_PAGE
 
-;	jmp	elevator_exit
+	jmp	keypad
 
 ;===============================
 ;===============================
@@ -575,6 +575,7 @@ elevator_inner_loop:
 ;===============================
 ;===============================
 
+keypad:
 	;=============================
 	; Load background to $c00
 
@@ -608,9 +609,15 @@ elevator_inner_loop:
 	lda	#$c			; load to off-screen $c00
 	jsr	load_rle_gr
 
+	;==================================
+	; draw walking off the elevator
 
-	jsr	gr_copy_to_current
-	jsr	page_flip
+	lda	#<keypad_sequence
+	sta	INTRO_LOOPL
+	lda	#>keypad_sequence
+	sta	INTRO_LOOPH
+
+	jsr	run_sequence
 
 
 keypad_loop:
@@ -908,8 +915,10 @@ gone_loop:
 .include "intro_graphics/03_elevator/intro_walking.inc"
 
 .include "intro_graphics/04_keypad/intro_scanner_door.inc"
-.include "intro_graphics/04_keypad/intro_keypad.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_scanner.inc"
 .include "intro_open_soda.inc"
@@ -1090,6 +1099,21 @@ approach_sequence:
 	.word	approach07_rle
 	.byte	0
 
+; Using keypad sequence
+
+keypad_sequence:
+	.byte	20
+	.word	hand04_01_rle
+	.byte	20
+	.word	hand04_02_rle
+	.byte	20
+	.word	hand04_03_rle
+	.byte	20
+	.word	hand04_02_rle
+	.byte	20
+	.word	hand04_02_rle
+	.byte	0
+
 
 
 

ootw/intro_graphics/04_keypad/Makefile

@@ -3,15 +3,15 @@ include ../../../Makefile.inc
 PNG2RLE = ../../../gr-utils/png2rle
 
 
-all:	intro_scanner_door.inc intro_keypad.inc intro_approach.inc
+all:	intro_scanner_door.inc intro_keypad_bg.inc intro_approach.inc intro_hands.inc
 
 #####
 
 intro_scanner_door.inc:	$(PNG2RLE) intro_scanner_door.png
 	$(PNG2RLE) asm intro_scanner_door.png scanner_door_rle > intro_scanner_door.inc
 
-intro_keypad.inc:	$(PNG2RLE) intro_keypad.png
-	$(PNG2RLE) asm intro_keypad.png keypad_rle > intro_keypad.inc
+intro_keypad_bg.inc:	$(PNG2RLE) intro_keypad_bg.png
+	$(PNG2RLE) asm intro_keypad_bg.png keypad_rle > intro_keypad_bg.inc
 
 intro_approach.inc:	$(PNG2RLE) approach01.png approach02.png \
 	approach03.png approach04.png approach05.png approach06.png \
@@ -26,5 +26,15 @@ intro_approach.inc:	$(PNG2RLE) approach01.png approach02.png \
 
 #####
 
+intro_hands.inc:	$(PNG2RLE) hand04_01.png hand04_02.png \
+	hand04_03.png
+	$(PNG2RLE) asm hand04_01.png hand04_01_rle > intro_hands.inc
+	$(PNG2RLE) asm hand04_02.png hand04_02_rle >> intro_hands.inc
+	$(PNG2RLE) asm hand04_03.png hand04_03_rle >> intro_hands.inc
+
+
+#####
+
+
 clean:		
 		rm -f *~ *.inc

ootw/intro_graphics/04_keypad/intro_keypad.inc

@@ -1,30 +0,0 @@
-keypad_rle:	.byte $28 ; ysize=48
-	.byte $A5,$00, $22, $A5,$00, $44, $A0,$12,$CC, $44, $AE,$00
-	.byte $22, $A0,$27,$00, $22, $A8,$00, $06, $26,$26, $66
-	.byte $06, $26,$26, $66, $06, $26,$26, $66, $A0,$13,$00
-	.byte $22, $A9,$00, $22,$22, $66, $00, $22,$22, $66
-	.byte $00, $22,$22, $66, $A0,$13,$00, $22, $A9,$00, $02,$02
-	.byte $66, $00, $02,$02, $66, $00, $02,$02, $66
-	.byte $A0,$13,$00, $22, $A8,$00, $06, $26,$26, $66, $06
-	.byte $26,$26, $66, $06, $26,$26, $66, $A0,$13,$00, $22
-	.byte $A9,$00, $22, $32, $66, $00, $22,$22, $66
-	.byte $00, $22,$22, $66, $A0,$13,$00, $22, $A9,$00, $33,$33
-	.byte $BB, $00, $02,$02, $66, $00, $02,$02, $66
-	.byte $A0,$13,$00, $22, $A8,$00, $06, $26, $33,$33, $BB
-	.byte $26,$26, $66, $06, $26,$26, $66, $A0,$13,$00, $22
-	.byte $A9,$00, $22, $A3,$33, $BB, $22, $66, $00
-	.byte $22,$22, $66, $A0,$13,$00, $22, $A9,$00, $02, $03
-	.byte $33,$33, $BB, $02, $66, $00, $02,$02, $66
-	.byte $A0,$13,$00, $22, $A8,$00, $06, $26,$26, $33,$33, $3B
-	.byte $B6, $33, $BB, $26, $B6, $66, $A0,$13,$00
-	.byte $22, $A8,$00, $30, $22,$22, $A3,$33, $BB, $33
-	.byte $A3,$BB, $B6, $A0,$13,$00, $22, $A8,$00, $33, $32
-	.byte $02, $A3,$33, $BB, $B3, $A4,$BB, $A0,$13,$00, $22
-	.byte $A8,$00, $33,$33, $00, $A4,$33, $A6,$BB, $B0, $A0,$11,$00
-	.byte $22, $A8,$00, $33,$33, $30, $A5,$33, $A6,$BB, $A0,$11,$00
-	.byte $22, $A8,$00, $A6,$33, $B3, $33, $A6,$BB, $A0,$11,$00
-	.byte $22, $A8,$00, $03, $A5,$33, $3B, $B3, $33
-	.byte $A5,$BB, $A0,$11,$00, $22, $A9,$00, $A6,$33, $3B, $B3
-	.byte $33, $A4,$BB, $A0,$11,$00, $22, $A9,$00, $A7,$33, $BB
-	.byte $33, $3B, $A3,$BB, $A0,$AC,$00
-	.byte $A1