ootw: add more intro pictures

ootw/Makefile

@@ -36,7 +36,9 @@ INTRO:	intro.o
 intro.o:	intro.s \
 	gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \
 	keyboard.s random16.s \
-	intro_building.inc
+	intro_building.inc intro_elevator.inc intro_off_elevator.inc \
+	intro_drinking.inc \
+	intro_tunnel2.inc intro_gone.inc
 	ca65 -o intro.o intro.s -l intro.lst
 ####
 
@@ -71,6 +73,21 @@ ootw_underwater.inc:	$(PNG2RLE) another_uboot.png
 intro_building.inc:	$(PNG2RLE) intro1_building.png
 	$(PNG2RLE) asm intro1_building.png building_rle > intro_building.inc
 
+intro_elevator.inc:	$(PNG2RLE) intro_elevator.png
+	$(PNG2RLE) asm intro_elevator.png elevator_rle > intro_elevator.inc
+
+intro_off_elevator.inc:	$(PNG2RLE) intro_off_elevator.png
+	$(PNG2RLE) asm intro_off_elevator.png off_elevator_rle > intro_off_elevator.inc
+
+intro_drinking.inc:	$(PNG2RLE) intro_drinking.png
+	$(PNG2RLE) asm intro_drinking.png drinking_rle > intro_drinking.inc
+
+intro_gone.inc:	$(PNG2RLE) intro_gone.png
+	$(PNG2RLE) asm intro_gone.png gone_rle > intro_gone.inc
+
+intro_tunnel2.inc:	$(PNG2RLE) intro_tunnel2.png
+	$(PNG2RLE) asm intro_tunnel2.png tunnel2_rle > intro_tunnel2.inc
+
 #####
 
 clean:		

ootw/intro.s

@@ -51,24 +51,104 @@ intro:
 building_loop:
 	lda	KEYPRESS
 	bpl	building_loop
+	bit	KEYRESET
 
-	;===============================
+;===============================
-	; Walk into door
+;===============================
+; Walk into door
+;===============================
+;===============================
 
-	;===============================
-	; Elevator going down
 
-	;===============================
-	; Getting out of Elevator
 
-	;===============================
-	; Keycode
 
-	;===============================
+;===============================
-	; Scanner
+;===============================
+; Elevator going down
+;===============================
+;===============================
+
+	;=============================
+	; Load background to $c00
+
+	lda	#$0c
+	sta	BASH
+	lda	#$00
+	sta	BASL			; load image off-screen $c00
+
+	lda	#>(elevator_rle)
+	sta	GBASH
+	lda	#<(elevator_rle)
+	sta	GBASL
+	jsr	load_rle_gr
+
+	;=================================
+	; copy $c00 to both pages $400/$800
+
+	jsr	gr_copy_to_current
+	jsr	page_flip
+	jsr	gr_copy_to_current
+
+elevator_loop:
+	lda	KEYPRESS
+	bpl	elevator_loop
+	bit	KEYRESET
+
+
+;===============================
+;===============================
+; Getting out of Elevator
+;===============================
+;===============================
+
+
+	;=============================
+	; Load background to $c00
+
+	lda	#$0c
+	sta	BASH
+	lda	#$00
+	sta	BASL			; load image off-screen $c00
+
+	lda	#>(off_elevator_rle)
+	sta	GBASH
+	lda	#<(off_elevator_rle)
+	sta	GBASL
+	jsr	load_rle_gr
+
+	;=================================
+	; copy $c00 to both pages $400/$800
+
+	jsr	gr_copy_to_current
+	jsr	page_flip
+	jsr	gr_copy_to_current
+
+off_elevator_loop:
+	lda	KEYPRESS
+	bpl	off_elevator_loop
+	bit	KEYRESET
+
+
+;===============================
+;===============================
+; Keycode
+;===============================
+;===============================
+
+
+;===============================
+;===============================
+; Scanner
+;===============================
+;===============================
+
+
+;===============================
+;===============================
+; Spinny DNA / Key
+;===============================
+;===============================
 
-	;===============================
-	; Spinny DNA / Key
 
 	;===============================
 	; Sitting at Desk
@@ -79,8 +159,46 @@ building_loop:
 	;===============================
 	; Particle Accelerator Screen
 
-	;===============================
+;===============================
-	; Soda
+;===============================
+; Opening Soda
+;===============================
+;===============================
+
+
+
+;===============================
+;===============================
+; Drinking Soda
+;===============================
+;===============================
+
+
+	;=============================
+	; Load background to $c00
+
+	lda	#$0c
+	sta	BASH
+	lda	#$00
+	sta	BASL			; load image off-screen $c00
+
+	lda	#>(drinking_rle)
+	sta	GBASH
+	lda	#<(drinking_rle)
+	sta	GBASL
+	jsr	load_rle_gr
+
+	;=================================
+	; copy $c00 to both pages $400/$800
+
+	jsr	gr_copy_to_current
+	jsr	page_flip
+	jsr	gr_copy_to_current
+
+drinking_loop:
+	lda	KEYPRESS
+	bpl	drinking_loop
+	bit	KEYRESET
 
 	;===============================
 	; More crazy screen
@@ -91,14 +209,73 @@ building_loop:
 	;===============================
 	; Tunnel 1
 
-	;===============================
-	; Tunnel 2
 
-	;===============================
+;===============================
-	; Zappo
+;===============================
+; Tunnel 2
+;===============================
+;===============================
 
 
+	;=============================
+	; Load background to $c00
 
+	lda	#$0c
+	sta	BASH
+	lda	#$00
+	sta	BASL			; load image off-screen $c00
+
+	lda	#>(tunnel2_rle)
+	sta	GBASH
+	lda	#<(tunnel2_rle)
+	sta	GBASL
+	jsr	load_rle_gr
+
+	;=================================
+	; copy $c00 to both pages $400/$800
+
+	jsr	gr_copy_to_current
+	jsr	page_flip
+	jsr	gr_copy_to_current
+
+tunnel2_loop:
+	lda	KEYPRESS
+	bpl	tunnel2_loop
+	bit	KEYRESET
+
+
+;===============================
+;===============================
+; Zappo / Gone
+;===============================
+;===============================
+
+
+	;=============================
+	; Load background to $c00
+
+	lda	#$0c
+	sta	BASH
+	lda	#$00
+	sta	BASL			; load image off-screen $c00
+
+	lda	#>(gone_rle)
+	sta	GBASH
+	lda	#<(gone_rle)
+	sta	GBASL
+	jsr	load_rle_gr
+
+	;=================================
+	; copy $c00 to both pages $400/$800
+
+	jsr	gr_copy_to_current
+	jsr	page_flip
+	jsr	gr_copy_to_current
+
+gone_loop:
+	lda	KEYPRESS
+	bpl	gone_loop
+	bit	KEYRESET
 
 
 
@@ -119,4 +296,10 @@ building_loop:
 .include "gr_copy.s"
 .include "gr_offsets.s"
 
+; background graphics
 .include "intro_building.inc"
+.include "intro_elevator.inc"
+.include "intro_off_elevator.inc"
+.include "intro_drinking.inc"
+.include "intro_tunnel2.inc"
+.include "intro_gone.inc"

ootw/intro_elevator.inc

@@ -0,0 +1,47 @@
+elevator_rle:	.byte $28 ; ysize=48
+	.byte $A9,$22, $A5,$00, $01, $00, $10, $A6,$00, $A5,$22
+	.byte $55, $A3,$22, $00, $A3,$22, $00, $AC,$22, $A5,$00
+	.byte $01, $00, $10, $00, $01, $A5,$00, $A4,$22
+	.byte $55, $A3,$22, $00, $A3,$22, $00, $AC,$22, $A7,$00
+	.byte $D0, $00, $01, $A5,$00, $88, $A3,$22, $55
+	.byte $A3,$22, $00, $A3,$22, $00, $A4,$22, $52, $20
+	.byte $00, $02, $A4,$22, $A7,$00, $DD, $A7,$00, $88
+	.byte $22, $00, $22, $55, $A3,$22, $00, $A3,$22
+	.byte $00, $AC,$22, $A7,$00, $DD, $A7,$00, $88, $22
+	.byte $55, $00, $55, $50, $20,$20, $00, $A3,$20
+	.byte $00, $A3,$20, $A9,$22, $A7,$00, $DD, $A7,$00, $88
+	.byte $22, $55, $88, $22, $55, $22,$22, $00
+	.byte $22,$22, $02, $00, $AC,$22, $A7,$00, $DD, $A7,$00
+	.byte $88, $22, $55, $88, $22, $55, $22,$22
+	.byte $00, $22,$22, $00,$00, $AC,$22, $A7,$00, $DD, $A6,$00
+	.byte $88,$88, $22, $55, $88, $22, $55, $22,$22
+	.byte $00, $22, $02, $20, $00, $AC,$22, $A7,$00
+	.byte $DD, $A5,$00, $80, $88,$88, $22, $55, $88
+	.byte $22, $55, $20,$20, $00, $20, $00, $20
+	.byte $00, $A3,$20, $A9,$22, $A7,$00, $DD, $00,$00, $60
+	.byte $00,$00, $A3,$88, $22, $55, $88, $22, $55
+	.byte $22,$22, $00, $22, $00, $22, $00, $AC,$22
+	.byte $A7,$00, $DD, $A4,$00, $80, $A3,$88, $22, $55
+	.byte $88, $22, $55, $20, $02, $A3,$00, $22
+	.byte $00, $AC,$22, $A7,$00, $DD, $A4,$00, $A4,$88, $22
+	.byte $55, $88, $22, $55, $22, $20, $00,$00
+	.byte $20, $22, $00, $AC,$22, $A7,$00, $DD, $A4,$00
+	.byte $A4,$88, $22, $55, $88, $22, $55, $20,$20
+	.byte $A3,$00, $20, $00, $A3,$20, $A9,$22, $A7,$00, $DD
+	.byte $A4,$00, $88, $58, $88,$88, $22, $55, $88
+	.byte $22, $55, $22,$22, $A3,$00, $02, $00, $AC,$22
+	.byte $A7,$00, $DD, $A4,$00, $88, $55, $88,$88, $22
+	.byte $55, $88, $22, $55, $22, $02, $A5,$00
+	.byte $02, $AB,$22, $A7,$00, $DD, $A3,$00, $50, $88
+	.byte $55, $58,$58, $22, $55, $88, $22, $55
+	.byte $22, $A3,$00, $22, $A4,$00, $02, $A9,$22, $A7,$00
+	.byte $DD, $A3,$00, $25, $28, $22,$22, $62, $22
+	.byte $55, $88, $22, $55, $A4,$00, $20,$20, $A4,$00
+	.byte $A9,$22, $A7,$00, $DD, $00, $20, $22,$22, $62
+	.byte $66,$66, $26, $22, $55, $88, $22, $55
+	.byte $A4,$00, $22, $02, $A4,$00, $A9,$22, $A7,$00, $2D
+	.byte $22,$22, $62, $A3,$66, $26, $22,$22, $55, $88
+	.byte $22, $55, $AA,$00, $A9,$22, $A5,$00, $20, $A3,$22
+	.byte $62, $A4,$66, $A3,$22, $55, $88, $22, $55
+	.byte $A0,$AA,$00
+	.byte $A1