ootw: intro: more size opt. still 6k too big

ootw/README

@@ -40,3 +40,4 @@ Memory squeeze!
 	 8,658 over	re-arrange memory map, 42k avail now
 	 8,562 over	move gr_make_quake out of common code
 	 8,374 over	remove extraneous code (mostly put_sprite_flipped)
+	 5,469 over     allow changing bg on fly in sequence

ootw/intro.s

@@ -1,3 +1,6 @@
+.define HACK 1
+
+
 ;=====================================
 ; Intro
 
@@ -28,9 +31,8 @@ intro:
 ; Opening scene with car
 ;===============================
 ;===============================
-
+.if HACK
-	;=============================
+	; Load background
-	; Load background to $c00
 
 	lda	#>(building_rle)
 	sta	GBASH
@@ -38,12 +40,8 @@ intro:
 	sta	GBASL
 
 	lda	#$0c				; load to $c00
-
 	jsr	load_rle_gr
 
-	;=================================
-	; copy $c00 to both pages $400/$800
-
 	jsr	gr_copy_to_current
 	jsr	page_flip
 
@@ -66,7 +64,6 @@ intro:
 	sta	GBASL
 
 	lda	#$0c				; load to $c00
-
 	jsr	load_rle_gr
 
 	jsr	gr_copy_to_current
@@ -97,6 +94,7 @@ intro:
 	sta	GBASH
 	lda	#<(outer_door_rle)
 	sta	GBASL
+
 	lda	#$c			; load to off-screen $c00
 	jsr	load_rle_gr
 
@@ -128,13 +126,15 @@ elevator:
 	sta	GBASH
 	lda	#<(elevator_rle)
 	sta	GBASL
+
 	lda	#$c			; load to off-screen $c00
 	jsr	load_rle_gr
+
 	lda	#>(elevator_rle)
 	sta	GBASH
 	lda	#<(elevator_rle)
 	sta	GBASL
-	lda	#$10			; load to off-screen $c00
+	lda	#$10			; load also to off-screen $1000
 	jsr	load_rle_gr
 
 
@@ -486,7 +486,7 @@ elevator_exit:
 
 
 	;=============================
-	; Load background to $c00
+	; Load elevator background
 
 	lda	#>(off_elevator_rle)
 	sta	GBASH
@@ -605,7 +605,7 @@ keypad:
 	jsr	load_rle_gr
 
 	;==================================
-	; draw walking off the elevator
+	; draw keypad sequence
 
 	lda	#<keypad_sequence
 	sta	INTRO_LOOPL
@@ -1509,7 +1509,7 @@ thunderstorm:
 ;	bpl	outside_loop
 ;	bit	KEYRESET
 
-
+.endif
 ;===============================
 ;===============================
 ; Tunnel 1
@@ -1645,6 +1645,8 @@ gone_loop:
 .include "intro_graphics/01_building/intro_building_car.inc"
 .include "intro_graphics/01_building/intro_car.inc"
 
+.if HACK
+
 .include "intro_graphics/02_outer_door/outer_door.inc"
 .include "intro_graphics/02_outer_door/feet.inc"
 
@@ -1658,6 +1660,8 @@ gone_loop:
 .include "intro_graphics/04_keypad/intro_hands.inc"
 .include "intro_graphics/04_keypad/intro_opening.inc"
 
+.endif
+
 .include "intro_graphics/05_scanner/intro_scanner.inc"
 .include "intro_graphics/05_scanner/intro_scanning.inc"
 .include "intro_graphics/05_scanner/intro_ai_bg.inc"
@@ -1687,8 +1691,25 @@ run_sequence:
 run_sequence_loop:
 	lda	(INTRO_LOOPL),Y		; get time
 	beq	run_sequence_done
-	tax
 
+	cmp	#$ff
+	bne	not_reload
+
+	iny
+
+	lda	(INTRO_LOOPL),Y
+	sta	GBASL
+	iny
+	lda	(INTRO_LOOPL),Y
+	sta	GBASH
+	iny
+	sty	INTRO_LOOPER		; save for later
+	lda	#$0c			; load to $c00
+	jsr	load_rle_gr
+	jmp	seq_stuff
+
+not_reload:
+	tax
 	jsr	long_wait
 
 	iny
@@ -1705,6 +1726,7 @@ run_sequence_loop:
 
 	jsr	gr_overlay
 	jsr	page_flip
+seq_stuff:
 	ldy	INTRO_LOOPER
 
 	jmp	run_sequence_loop
@@ -1906,7 +1928,7 @@ outtacar_sequence:
 
 
 ; Getting out of car sequence
-
+.if HACK
 feet_sequence:
 	.byte	100
 	.word	feet01_rle
@@ -1944,6 +1966,8 @@ feet_sequence:
 	.word	nothing_rle
 	.byte	0
 
+
+
 ; Walking off elevator sequence
 
 walking_sequence:
@@ -2132,7 +2156,7 @@ scanning_sequence:
 	.word	scan19_rle
 	.byte	0
 
-
+.endif
 
 ; AI sequence
 
@@ -2233,7 +2257,6 @@ accelerator:
 	.byte 0,18, ":/_________:/",0
 	.byte 255
 
-
 ; Power-up sequence
 
 soda_sequence:
@@ -2608,7 +2631,7 @@ drinking_sequence:
 	.word drinking05_rle
 	.byte 0
 
-
+.if HACK
 
 	; Lightning sequence
 lightning_sequence:
@@ -2848,7 +2871,7 @@ bolt_sequence:
 	.byte 0
 ;	.word nothing_rle
 
-
+.endif
 	;=======================
 	; Tunnel1 Sequence
 	;=======================
@@ -3029,93 +3052,165 @@ gone_sequence:
 
 	.byte 50
 	.word white_rle
+
 	.byte 7
 	.word gone01_rle	; B
+
 	.byte 7
 	.word gone02_rle	; B
+
 	.byte 7
 	.word gone03_rle	; B
+
 	.byte 7
 	.word gone04_rle	; B
+
 	.byte 7
 	.word gone05_rle	; B
+
 	.byte 7
 	.word gone06_rle	; B
+
 	.byte 7
 	.word gone07_rle	; B
+
 	.byte 7
 	.word gone08_rle	; B
+
 	.byte 7
 	.word gone09_rle	; LB
+
 	.byte 7
 	.word gone10_rle	; CY
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone11_rle	; LB
+
+	.byte 255
+	.word gone_rle		; B back into $c00
 	.byte 7
 	.word gone02_rle	; B (12 is dupe of 2)
+
 	.byte 7
 	.word gone13_rle	; B
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone14_rle	; LB
+
+	.byte 255
+	.word gone_rle		; B back into $c00 + plain
 	.byte 7
-	.word nothing_rle	; B (plain?)
+	.word nothing_rle
+
 	.byte 7
 	.word gone16_rle	; B
+
 	.byte 7
 	.word nothing_rle	; B (plain?)
+
 	.byte 7
 	.word gone18_rle	; B
+
 	.byte 7
 	.word gone19_rle	; B
+
 	.byte 7
 	.word gone20_rle	; B
+
 	.byte 7
 	.word gone21_rle	; B
+
 	.byte 7
 	.word nothing_rle	; B (plain?)
+
 	.byte 7
 	.word gone23_rle	; B
+
 	.byte 7
 	.word gone24_rle	; B
+
 	.byte 7
 	.word gone25_rle	; B
+
 	.byte 7
 	.word gone26_rle	; B
+
 	.byte 7
 	.word gone27_rle	; B
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone28_rle	; LB
+
+	.byte 255
+	.word gone10_rle	; CY into $c00
 	.byte 7
 	.word gone29_rle	; CY
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
-	.word gone30_rle	; LB
+	.word gone28_rle	; LB (30 same as 28)
+
+	.byte 255
+	.word gone_rle		; B back into $c00 + plain
 	.byte 7
 	.word gone31_rle	; B
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone32_rle	; LB
+
+	.byte 255
+	.word gone_rle		; B back into $c00 + plain
 	.byte 7
 	.word nothing_rle	; B (plain?)
+
 	.byte 7
 	.word gone34_rle	; B
+
 	.byte 7
 	.word gone35_rle	; B
+
 	.byte 7
 	.word gone36_rle	; B
+
 	.byte 7
 	.word gone37_rle	; B
+
 	.byte 7
 	.word gone38_rle	; B
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone39_rle	; LB
+
+	.byte 255
+	.word gone10_rle	; CY into $c00
 	.byte 7
 	.word gone40_rle	; CY
+
 	.byte 7
 	.word gone41_rle	; CY
+
+	.byte 255
+	.word gone09_rle	; LB into $c00
 	.byte 7
 	.word gone42_rle	; LB
+
+	.byte 255
+	.word gone_rle		; B back into $c00 + plain
 	.byte 7
 	.word gone43_rle	; B
+
 	.byte 7
 	.word nothing_rle
 	.byte 0
-;	.word nothing_rle
+

ootw/intro_graphics/10_gone/Makefile

@@ -105,7 +105,7 @@ intro_gone.inc:	$(PNG2RLE) \
 	$(PNG2RLE) asm gone27.png gone27_rle >> intro_gone.inc
 	$(PNG2RLE) asm gone28.png gone28_rle >> intro_gone.inc
 	$(PNG2RLE) asm gone29.png gone29_rle >> intro_gone.inc
-	$(PNG2RLE) asm gone30.png gone30_rle >> intro_gone.inc
+#	$(PNG2RLE) asm gone30.png gone30_rle >> intro_gone.inc
 	$(PNG2RLE) asm gone31.png gone31_rle >> intro_gone.inc
 	$(PNG2RLE) asm gone32.png gone32_rle >> intro_gone.inc
 #	$(PNG2RLE) asm gone33.png gone33_rle >> intro_gone.inc

ootw/intro_graphics/10_gone/intro_gone.inc

@@ -192,53 +192,9 @@ gone10_rle:	.byte $28 ; ysize=48
 	.byte $62, $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone11_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$45,$AA, $7A, $A0,$26,$AA, $77, $A0,$26,$AA, $77, $A0,$01,$A7
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $A0,$26,$AA, $77, $A0,$27,$AA, $77, $A0,$27,$AA, $77, $A0,$26,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $A0,$01,$A7, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$8F,$AA
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26,$26, $22
-	.byte $66, $62, $66, $22, $76, $66, $A3,$22
-	.byte $2F, $F2, $A4,$22, $66,$66, $26, $22, $26
-	.byte $A5,$66, $62, $22, $62, $66,$66, $22, $66
-	.byte $22,$22, $F6, $66, $62, $22, $62, $26
-	.byte $22, $66, $22, $77, $62, $A5,$22, $2F
-	.byte $F2, $A3,$22, $A3,$66, $62,$62, $AA,$66, $22,$22, $62
-	.byte $22, $A4,$66, $62, $22,$22, $66, $77, $27
-	.byte $22, $26, $62, $66,$66, $22,$22, $6F, $A3,$22
-	.byte $AB,$66, $26, $E6, $66,$66, $62, $22, $66
-	.byte $22, $26, $A5,$66, $52, $56, $77, $62
-	.byte $66,$66, $26, $A3,$66, $A5,$22, $AA,$66, $62, $2E
-	.byte $EE, $6E, $66, $22,$22, $66, $A6,$22, $26
-	.byte $5F, $55, $77, $A7,$26, $22, $F6, $A3,$22
-	.byte $A6,$66, $22, $A3,$EF, $66,$66, $62, $66,$66, $22,$22
-	.byte $66, $A5,$22, $62, $26, $22, $66, $77
-	.byte $A8,$22, $FF, $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66
-	.byte $A3,$26, $22,$22, $66, $22,$22, $62, $66,$66, $26
-	.byte $22, $66, $27, $66, $62, $A7,$22, $FF
-	.byte $A3,$22, $A6,$66, $22, $EE, $E2, $EE, $22,$22
-	.byte $A3,$F2, $22, $62, $22, $62, $A3,$66, $26
-	.byte $A5,$22, $66,$66, $A6,$22, $FF, $A3,$22, $A6,$66, $22
-	.byte $A3,$EE, $6F,$6F, $A3,$66, $22, $26, $62, $22
-	.byte $66,$66, $A3,$22, $6E,$6E, $FF, $22, $26, $66
-	.byte $6F, $F2, $A4,$22, $26, $A3,$22, $A6,$66, $22
-	.byte $A3,$EE, $66,$66, $26, $66, $A3,$22, $26, $62
-	.byte $A5,$22, $66,$66, $EF, $22,$22, $A3,$66, $A3,$22, $62
-	.byte $A4,$22, $A6,$66, $22,$22, $EE,$EE, $FE, $66,$66, $22,$22
-	.byte $62, $26, $22, $26, $A5,$22, $26,$26, $2E
-	.byte $22,$22, $26, $62, $26, $22,$22, $62, $26
-	.byte $A4,$22, $A6,$66, $22,$22, $EE,$EE, $FF, $66, $26
-	.byte $22,$22, $66, $A0,$11,$22, $62, $26, $A5,$22, $A6,$66
-	.byte $22,$22, $EE, $2E, $A0,$16,$22, $F2, $A7,$22, $A6,$66
-	.byte $AE,$22, $A3,$62, $22, $62,$62, $A4,$22, $E2, $EE
-	.byte $FF, $A7,$22, $A4,$66, $26, $A8,$22, $26, $62
-	.byte $A4,$22, $66, $22, $66, $22, $66, $22,$22
-	.byte $26, $22, $57, $27, $EE, $E6, $FF
-	.byte $A7,$22, $66,$66, $26, $AF,$22, $26, $66, $22
-	.byte $FE, $22, $6E, $A5,$22, $66, $EE,$EE, $FF
-	.byte $A7,$22, $26, $A0,$12,$22, $66, $22, $66, $22
-	.byte $26, $A6,$22, $EE,$EE, $FF, $A0,$1C,$22, $26, $A4,$22
-	.byte $62, $A3,$22, $EE,$EE, $FF, $A0,$1B,$22, $62, $A4,$22
-	.byte $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone13_rle:	.byte $28 ; ysize=48
 	.byte $A0,$16,$AA, $7A, $A0,$27,$AA, $77, $A6,$AA, $7A, $A0,$20,$AA
@@ -248,53 +204,9 @@ gone13_rle:	.byte $28 ; ysize=48
 	.byte $A0,$FF,$AA, $A0,$8F,$AA
 	.byte $A1
 gone14_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$3F,$AA, $7A, $A5,$AA, $7A, $A0,$21,$AA, $77, $A0,$27,$AA
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $77, $A0,$27,$AA, $A0,$01,$A7, $7A, $A0,$02,$AA, $7A, $A0,$27,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $77, $A0,$4E,$AA, $A0,$01,$A7, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$8F,$AA
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26, $76
-	.byte $22, $66, $62, $66, $22, $76, $66
-	.byte $A3,$22, $2F, $F2, $A4,$22, $66,$66, $26, $22
-	.byte $26, $A5,$66, $62, $22, $62, $66,$66, $22
-	.byte $66, $22,$22, $F6, $66, $62, $22, $77
-	.byte $26, $22, $66, $22,$22, $62, $A5,$22, $2F
-	.byte $F2, $A3,$22, $A3,$66, $62,$62, $AA,$66, $22,$22, $62
-	.byte $22, $A4,$66, $77, $22,$22, $66, $A3,$22, $26
-	.byte $62, $66,$66, $22,$22, $6F, $A3,$22, $AB,$66, $26
-	.byte $E6, $66,$66, $62, $22, $66, $22, $26
-	.byte $A3,$66, $67, $76, $52, $56, $72, $62
-	.byte $66,$66, $26, $A3,$66, $A5,$22, $AA,$66, $62, $2E
-	.byte $EE, $6E, $66, $22,$22, $66, $A6,$22, $26
-	.byte $5F, $55, $77, $A7,$26, $22, $F6, $A3,$22
-	.byte $A6,$66, $22, $A3,$EF, $66,$66, $62, $66,$66, $22,$22
-	.byte $66, $A5,$22, $62, $26, $22, $66, $A9,$22
-	.byte $FF, $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66, $A3,$26
-	.byte $22,$22, $66, $22,$22, $62, $66,$66, $26, $22
-	.byte $66, $27, $66, $62, $A7,$22, $FF, $A3,$22
-	.byte $A6,$66, $22, $EE, $E2, $EE, $22,$22, $A3,$F2
-	.byte $22, $62, $22, $62, $A3,$66, $26, $A5,$22
-	.byte $66,$66, $A6,$22, $FF, $A3,$22, $A6,$66, $22, $A3,$EE
-	.byte $6F,$6F, $A3,$66, $22, $26, $62, $22, $66,$66
-	.byte $A3,$22, $6E,$6E, $FF, $22, $26, $66, $6F
-	.byte $F2, $A4,$22, $26, $A3,$22, $A6,$66, $22, $A3,$EE
-	.byte $66,$66, $26, $66, $A3,$22, $26, $62, $A5,$22
-	.byte $66,$66, $EF, $22,$22, $A3,$66, $A3,$22, $62, $A4,$22
-	.byte $A6,$66, $22,$22, $EE,$EE, $FE, $66,$66, $22,$22, $62
-	.byte $26, $22, $26, $A5,$22, $26,$26, $2E, $22,$22
-	.byte $26, $62, $26, $22,$22, $62, $26, $A4,$22
-	.byte $A6,$66, $22,$22, $EE,$EE, $FF, $66, $26, $22,$22
-	.byte $66, $A0,$11,$22, $62, $26, $A5,$22, $A6,$66, $22,$22
-	.byte $EE, $2E, $A0,$16,$22, $F2, $A7,$22, $A6,$66, $AE,$22
-	.byte $A3,$62, $22, $62,$62, $A4,$22, $E2, $EE, $FF
-	.byte $A7,$22, $A4,$66, $26, $A8,$22, $26, $62, $A4,$22
-	.byte $66, $22, $66, $22, $66, $22,$22, $26
-	.byte $22, $57, $27, $EE, $E6, $FF, $A7,$22
-	.byte $66,$66, $26, $AF,$22, $26, $66, $22, $FE
-	.byte $22, $6E, $A5,$22, $66, $EE,$EE, $FF, $A7,$22
-	.byte $26, $A0,$12,$22, $66, $22, $66, $22, $26
-	.byte $A6,$22, $EE,$EE, $FF, $A0,$1C,$22, $26, $A4,$22, $62
-	.byte $A3,$22, $EE,$EE, $FF, $A0,$1B,$22, $62, $A4,$22, $26,$26
-	.byte $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone16_rle:	.byte $28 ; ysize=48
 	.byte $A0,$3E,$AA, $77, $A0,$27,$AA, $77, $A0,$27,$AA, $A0,$01,$A7, $7A
@@ -347,53 +259,9 @@ gone27_rle:	.byte $28 ; ysize=48
 	.byte $7A, $77, $A0,$01,$A7, $A4,$77, $7A, $A0,$AE,$AA
 	.byte $A1
 gone28_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$3F,$AA, $7A, $A0,$27,$AA, $77, $A0,$27,$AA, $77, $A0,$28,$AA
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $77, $A0,$02,$AA, $7A, $A0,$27,$AA, $A0,$01,$A7, $A0,$FF,$AA, $A0,$FF,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $A0,$DE,$AA
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26, $76
-	.byte $22, $66, $62, $66, $22, $76, $66
-	.byte $A3,$22, $2F, $F2, $A4,$22, $66,$66, $26, $22
-	.byte $26, $A5,$66, $62, $22, $62, $66,$66, $22
-	.byte $66, $22,$22, $F6, $66, $62, $22, $77
-	.byte $26, $22, $66, $22,$22, $62, $A5,$22, $2F
-	.byte $F2, $A3,$22, $A3,$66, $62,$62, $AA,$66, $22,$22, $62
-	.byte $22, $A4,$66, $77, $22,$22, $66, $A3,$22, $26
-	.byte $62, $66,$66, $22,$22, $6F, $A3,$22, $AB,$66, $26
-	.byte $E6, $66,$66, $62, $22, $66, $22, $26
-	.byte $A4,$66, $77, $52, $56, $72, $62, $66,$66
-	.byte $26, $A3,$66, $A5,$22, $AA,$66, $62, $2E, $EE
-	.byte $6E, $66, $22,$22, $66, $A6,$22, $26, $5F
-	.byte $55, $27, $A7,$26, $22, $F6, $A3,$22, $A6,$66
-	.byte $22, $A3,$EF, $66,$66, $62, $66,$66, $22,$22, $66
-	.byte $A5,$22, $62, $26, $22, $66, $A9,$22, $FF
-	.byte $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66, $A3,$26, $22,$22
-	.byte $66, $22,$22, $62, $66,$66, $26, $22, $66
-	.byte $27, $66, $62, $A7,$22, $FF, $A3,$22, $A6,$66
-	.byte $22, $EE, $E2, $EE, $22,$22, $A3,$F2, $22
-	.byte $62, $22, $62, $A3,$66, $26, $A5,$22, $66,$66
-	.byte $A6,$22, $FF, $A3,$22, $A6,$66, $22, $A3,$EE, $6F,$6F
-	.byte $A3,$66, $22, $26, $62, $22, $66,$66, $A3,$22
-	.byte $6E,$6E, $FF, $22, $26, $66, $6F, $F2
-	.byte $A4,$22, $26, $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66
-	.byte $26, $66, $A3,$22, $26, $62, $A5,$22, $66,$66
-	.byte $EF, $22,$22, $A3,$66, $A3,$22, $62, $A4,$22, $A6,$66
-	.byte $22,$22, $EE,$EE, $FE, $66,$66, $22,$22, $62, $26
-	.byte $22, $26, $A5,$22, $26,$26, $2E, $22,$22, $26
-	.byte $62, $26, $22,$22, $62, $26, $A4,$22, $A6,$66
-	.byte $22,$22, $EE,$EE, $FF, $66, $26, $22,$22, $66
-	.byte $A0,$11,$22, $62, $26, $A5,$22, $A6,$66, $22,$22, $EE
-	.byte $2E, $A0,$16,$22, $F2, $A7,$22, $A6,$66, $AE,$22, $A3,$62
-	.byte $22, $62,$62, $A4,$22, $E2, $EE, $FF, $A7,$22
-	.byte $A4,$66, $26, $A8,$22, $26, $62, $A4,$22, $66
-	.byte $22, $66, $22, $66, $22,$22, $26, $22
-	.byte $57, $27, $EE, $E6, $FF, $A7,$22, $66,$66
-	.byte $26, $AF,$22, $26, $66, $22, $FE, $22
-	.byte $6E, $A5,$22, $66, $EE,$EE, $FF, $A7,$22, $26
-	.byte $A0,$12,$22, $66, $22, $66, $22, $26, $A6,$22
-	.byte $EE,$EE, $FF, $A0,$1C,$22, $26, $A4,$22, $62, $A3,$22
-	.byte $EE,$EE, $FF, $A0,$1B,$22, $62, $A4,$22, $26,$26, $A4,$22
-	.byte $2F, $A0,$A8,$22
 	.byte $A1
 gone29_rle:	.byte $28 ; ysize=48
 	.byte $A7,$EE, $22, $2E, $A5,$EE, $2E, $22, $EE
@@ -444,55 +312,6 @@ gone29_rle:	.byte $28 ; ysize=48
 	.byte $A3,$FF, $AE,$22, $E2, $2E,$2E, $A6,$22, $EE, $A3,$22
 	.byte $62, $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
-gone30_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26, $76
-	.byte $22, $66, $62, $66, $22, $76, $66
-	.byte $A3,$22, $2F, $F2, $A4,$22, $66,$66, $26, $22
-	.byte $26, $A5,$66, $62, $22, $62, $66,$66, $22
-	.byte $66, $22,$22, $F6, $66, $62, $22, $77
-	.byte $26, $22, $66, $22,$22, $62, $A5,$22, $2F
-	.byte $F2, $A3,$22, $A3,$66, $62,$62, $AA,$66, $22,$22, $62
-	.byte $22, $A4,$66, $77, $22,$22, $66, $A3,$22, $26
-	.byte $62, $66,$66, $22,$22, $6F, $A3,$22, $AB,$66, $26
-	.byte $E6, $66,$66, $62, $22, $66, $22, $26
-	.byte $A4,$66, $77, $52, $56, $72, $62, $66,$66
-	.byte $26, $A3,$66, $A5,$22, $AA,$66, $62, $2E, $EE
-	.byte $6E, $66, $22,$22, $66, $A6,$22, $26, $5F
-	.byte $55, $27, $A7,$26, $22, $F6, $A3,$22, $A6,$66
-	.byte $22, $A3,$EF, $66,$66, $62, $66,$66, $22,$22, $66
-	.byte $A5,$22, $62, $26, $22, $66, $A9,$22, $FF
-	.byte $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66, $A3,$26, $22,$22
-	.byte $66, $22,$22, $62, $66,$66, $26, $22, $66
-	.byte $27, $66, $62, $A7,$22, $FF, $A3,$22, $A6,$66
-	.byte $22, $EE, $E2, $EE, $22,$22, $A3,$F2, $22
-	.byte $62, $22, $62, $A3,$66, $26, $A5,$22, $66,$66
-	.byte $A6,$22, $FF, $A3,$22, $A6,$66, $22, $A3,$EE, $6F,$6F
-	.byte $A3,$66, $22, $26, $62, $22, $66,$66, $A3,$22
-	.byte $6E,$6E, $FF, $22, $26, $66, $6F, $F2
-	.byte $A4,$22, $26, $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66
-	.byte $26, $66, $A3,$22, $26, $62, $A5,$22, $66,$66
-	.byte $EF, $22,$22, $A3,$66, $A3,$22, $62, $A4,$22, $A6,$66
-	.byte $22,$22, $EE,$EE, $FE, $66,$66, $22,$22, $62, $26
-	.byte $22, $26, $A5,$22, $26,$26, $2E, $22,$22, $26
-	.byte $62, $26, $22,$22, $62, $26, $A4,$22, $A6,$66
-	.byte $22,$22, $EE,$EE, $FF, $66, $26, $22,$22, $66
-	.byte $A0,$11,$22, $62, $26, $A5,$22, $A6,$66, $22,$22, $EE
-	.byte $2E, $A0,$16,$22, $F2, $A7,$22, $A6,$66, $AE,$22, $A3,$62
-	.byte $22, $62,$62, $A4,$22, $E2, $EE, $FF, $A7,$22
-	.byte $A4,$66, $26, $A8,$22, $26, $62, $A4,$22, $66
-	.byte $22, $66, $22, $66, $22,$22, $26, $22
-	.byte $57, $27, $EE, $E6, $FF, $A7,$22, $66,$66
-	.byte $26, $AF,$22, $26, $66, $22, $FE, $22
-	.byte $6E, $A5,$22, $66, $EE,$EE, $FF, $A7,$22, $26
-	.byte $A0,$12,$22, $66, $22, $66, $22, $26, $A6,$22
-	.byte $EE,$EE, $FF, $A0,$1C,$22, $26, $A4,$22, $62, $A3,$22
-	.byte $EE,$EE, $FF, $A0,$1B,$22, $62, $A4,$22, $26,$26, $A4,$22
-	.byte $2F, $A0,$A8,$22
-	.byte $A1
 gone31_rle:	.byte $28 ; ysize=48
 	.byte $A0,$3E,$AA, $7A, $A0,$27,$AA, $77, $A0,$27,$AA, $77, $A0,$27,$AA
 	.byte $77, $7A,$7A, $A3,$AA, $A3,$A7, $A0,$25,$AA, $7A, $A0,$FF,$AA
@@ -501,52 +320,9 @@ gone31_rle:	.byte $28 ; ysize=48
 	.byte $A0,$01,$A7, $A4,$77, $7A, $A0,$AE,$AA
 	.byte $A1
 gone32_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$45,$AA, $7A, $A0,$49,$AA, $7A, $A0,$28,$AA, $77, $A0,$02,$AA
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $7A, $A0,$27,$AA, $A0,$01,$A7, $A0,$4E,$AA, $A0,$01,$A7, $A0,$FF,$AA, $A0,$FF,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $A0,$8F,$AA
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26,$26, $22
-	.byte $66, $62, $66, $22, $76, $66, $A3,$22
-	.byte $2F, $F2, $A4,$22, $66,$66, $26, $22, $26
-	.byte $A5,$66, $62, $22, $62, $66,$66, $22, $66
-	.byte $22,$22, $F6, $66, $62, $22,$22, $26, $22
-	.byte $66, $22,$22, $62, $A5,$22, $2F, $F2, $A3,$22
-	.byte $A3,$66, $62,$62, $AA,$66, $22,$22, $62, $22, $A4,$66
-	.byte $72, $22,$22, $66, $A3,$22, $26, $62, $66,$66
-	.byte $22,$22, $6F, $A3,$22, $AB,$66, $26, $E6, $66,$66
-	.byte $62, $22, $66, $22, $26, $A4,$66, $77
-	.byte $52, $56, $72, $62, $66,$66, $26, $A3,$66
-	.byte $A5,$22, $AA,$66, $62, $2E, $EE, $6E, $66
-	.byte $22,$22, $66, $A6,$22, $26, $5F, $55, $27
-	.byte $A7,$26, $22, $F6, $A3,$22, $A6,$66, $22, $A3,$EF
-	.byte $66,$66, $62, $66,$66, $22,$22, $66, $A5,$22, $62
-	.byte $26, $22, $66, $A9,$22, $FF, $A3,$22, $A6,$66
-	.byte $22, $A3,$EE, $66,$66, $A3,$26, $22,$22, $66, $22,$22
-	.byte $62, $66,$66, $26, $22, $66, $27, $66
-	.byte $62, $A7,$22, $FF, $A3,$22, $A6,$66, $22, $EE
-	.byte $E2, $EE, $22,$22, $A3,$F2, $22, $62, $22
-	.byte $62, $A3,$66, $26, $A5,$22, $66,$66, $A6,$22, $FF
-	.byte $A3,$22, $A6,$66, $22, $A3,$EE, $6F,$6F, $A3,$66, $22
-	.byte $26, $62, $22, $66,$66, $A3,$22, $6E,$6E, $FF
-	.byte $22, $26, $66, $6F, $F2, $A4,$22, $26
-	.byte $A3,$22, $A6,$66, $22, $A3,$EE, $66,$66, $26, $66
-	.byte $A3,$22, $26, $62, $A5,$22, $66,$66, $EF, $22,$22
-	.byte $A3,$66, $A3,$22, $62, $A4,$22, $A6,$66, $22,$22, $EE,$EE
-	.byte $FE, $66,$66, $22,$22, $62, $26, $22, $26
-	.byte $A5,$22, $26,$26, $2E, $22,$22, $26, $62, $26
-	.byte $22,$22, $62, $26, $A4,$22, $A6,$66, $22,$22, $EE,$EE
-	.byte $FF, $66, $26, $22,$22, $66, $A0,$11,$22, $62
-	.byte $26, $A5,$22, $A6,$66, $22,$22, $EE, $2E, $A0,$16,$22
-	.byte $F2, $A7,$22, $A6,$66, $AE,$22, $A3,$62, $22, $62,$62
-	.byte $A4,$22, $E2, $EE, $FF, $A7,$22, $A4,$66, $26
-	.byte $A8,$22, $26, $62, $A4,$22, $66, $22, $66
-	.byte $22, $66, $22,$22, $26, $22, $57, $27
-	.byte $EE, $E6, $FF, $A7,$22, $66,$66, $26, $AF,$22
-	.byte $26, $66, $22, $FE, $22, $6E, $A5,$22
-	.byte $66, $EE,$EE, $FF, $A7,$22, $26, $A0,$12,$22, $66
-	.byte $22, $66, $22, $26, $A6,$22, $EE,$EE, $FF
-	.byte $A0,$1C,$22, $26, $A4,$22, $62, $A3,$22, $EE,$EE, $FF
-	.byte $A0,$1B,$22, $62, $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone34_rle:	.byte $28 ; ysize=48
 	.byte $A0,$19,$AA, $A3,$AF, $A0,$1F,$AA, $FA, $A0,$28,$AA, $A0,$01,$AF, $A0,$33,$AA
@@ -574,52 +350,9 @@ gone38_rle:	.byte $28 ; ysize=48
 	.byte $A0,$24,$AA, $A0,$01,$AF, $A0,$02,$AA, $FA, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$B6,$AA
 	.byte $A1
 gone39_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$92,$AA, $EA, $A0,$25,$AA, $EA, $FA, $FE, $EA
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $A0,$24,$AA, $A0,$01,$AE, $FF,$FF, $7E, $A0,$24,$AA, $A0,$01,$AE, $A0,$01,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $EE, $A0,$27,$AA, $A0,$01,$A7, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$8F,$AA
-	.byte $62, $22, $26, $66, $26, $22, $62
-	.byte $22,$22, $66, $22, $62, $22,$22, $26,$26, $22
-	.byte $66, $62, $66, $22, $76, $66, $A3,$22
-	.byte $2F, $F2, $A4,$22, $66,$66, $26, $22, $26
-	.byte $A5,$66, $62, $22, $62, $66,$66, $22, $66
-	.byte $22,$22, $F6, $66, $62, $22,$22, $26, $22
-	.byte $66, $22,$22, $62, $A5,$22, $2F, $F2, $A3,$22
-	.byte $A3,$66, $62,$62, $AA,$66, $22,$22, $62, $22, $A4,$66
-	.byte $62, $22,$22, $E6, $A3,$22, $26, $62, $66,$66
-	.byte $22,$22, $6F, $A3,$22, $AB,$66, $26, $E6, $66,$66
-	.byte $62, $22, $66, $22, $26, $A4,$66, $E6
-	.byte $F2, $FE, $E2, $62, $66,$66, $26, $A3,$66
-	.byte $A5,$22, $AA,$66, $62, $2E, $EE, $6E, $66
-	.byte $22,$22, $66, $A6,$22, $2E, $FF,$FF, $7E, $A7,$26
-	.byte $22, $F6, $A3,$22, $A6,$66, $22, $A3,$EF, $66,$66
-	.byte $62, $66,$66, $22,$22, $66, $A5,$22, $62, $2E
-	.byte $22, $EE, $A9,$22, $FF, $A3,$22, $A6,$66, $22
-	.byte $A3,$EE, $66,$66, $A3,$26, $22,$22, $66, $22,$22, $62
-	.byte $66,$66, $26, $22, $66, $27, $66, $62
-	.byte $A7,$22, $FF, $A3,$22, $A6,$66, $22, $EE, $E2
-	.byte $EE, $22,$22, $A3,$F2, $22, $62, $22, $62
-	.byte $A3,$66, $26, $A5,$22, $66,$66, $A6,$22, $FF, $A3,$22
-	.byte $A6,$66, $22, $A3,$EE, $6F,$6F, $A3,$66, $22, $26
-	.byte $62, $22, $66,$66, $A3,$22, $6E,$6E, $FF, $22
-	.byte $26, $66, $6F, $F2, $A4,$22, $26, $A3,$22
-	.byte $A6,$66, $22, $A3,$EE, $66,$66, $26, $66, $A3,$22
-	.byte $26, $62, $A5,$22, $66,$66, $EF, $22,$22, $A3,$66
-	.byte $A3,$22, $62, $A4,$22, $A6,$66, $22,$22, $EE,$EE, $FE
-	.byte $66,$66, $22,$22, $62, $26, $22, $26, $A5,$22
-	.byte $26,$26, $2E, $22,$22, $26, $62, $26, $22,$22
-	.byte $62, $26, $A4,$22, $A6,$66, $22,$22, $EE,$EE, $FF
-	.byte $66, $26, $22,$22, $66, $A0,$11,$22, $62, $26
-	.byte $A5,$22, $A6,$66, $22,$22, $EE, $2E, $A0,$16,$22, $F2
-	.byte $A7,$22, $A6,$66, $AE,$22, $A3,$62, $22, $62,$62, $A4,$22
-	.byte $E2, $EE, $FF, $A7,$22, $A4,$66, $26, $A8,$22
-	.byte $26, $62, $A4,$22, $66, $22, $66, $22
-	.byte $66, $22,$22, $26, $22, $57, $27, $EE
-	.byte $E6, $FF, $A7,$22, $66,$66, $26, $AF,$22, $26
-	.byte $66, $22, $FE, $22, $6E, $A5,$22, $66
-	.byte $EE,$EE, $FF, $A7,$22, $26, $A0,$12,$22, $66, $22
-	.byte $66, $22, $26, $A6,$22, $EE,$EE, $FF, $A0,$1C,$22
-	.byte $26, $A4,$22, $62, $A3,$22, $EE,$EE, $FF, $A0,$1B,$22
-	.byte $62, $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone40_rle:	.byte $28 ; ysize=48
 	.byte $A7,$EE, $22, $2E, $A5,$EE, $2E, $22, $EE
@@ -720,54 +453,11 @@ gone41_rle:	.byte $28 ; ysize=48
 	.byte $62, $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone42_rle:	.byte $28 ; ysize=48
-	.byte $A5,$66, $62, $66, $22, $26, $A5,$66, $26
+	.byte $A0,$92,$AA, $EA, $A0,$25,$AA, $EA, $FA, $FE, $EA
-	.byte $A3,$22, $66, $A3,$22, $65, $66, $22, $A3,$66
+	.byte $A0,$24,$AA, $A0,$01,$AE, $FF,$FF, $7E, $A0,$24,$AA, $A0,$01,$AE, $A0,$01,$AA
-	.byte $22, $62, $52, $A3,$22, $F6, $A5,$22, $A8,$66
+	.byte $EE, $A0,$26,$AA, $66, $A0,$01,$A7, $A0,$25,$AA, $7A, $A0,$01,$A7
-	.byte $62, $22, $26, $66, $26, $22, $62
+	.byte $A0,$25,$AA, $7A, $A0,$26,$AA, $7A, $A0,$01,$A7, $A0,$26,$AA, $77
-	.byte $22,$22, $66, $22, $62, $22,$22, $26,$26, $22
+	.byte $A0,$25,$AA, $7A, $A0,$02,$A7, $A0,$23,$AA, $A3,$A7, $A0,$FF,$AA, $A0,$A4,$AA
-	.byte $66, $62, $66, $22, $76, $66, $A3,$22
-	.byte $2F, $F2, $A4,$22, $66,$66, $26, $22, $26
-	.byte $A5,$66, $62, $22, $62, $66,$66, $22, $66
-	.byte $22,$22, $F6, $66, $62, $22,$22, $26, $22
-	.byte $66, $22,$22, $62, $A5,$22, $2F, $F2, $A3,$22
-	.byte $A3,$66, $62,$62, $AA,$66, $22,$22, $62, $22, $A4,$66
-	.byte $62, $22,$22, $E6, $A3,$22, $26, $62, $66,$66
-	.byte $22,$22, $6F, $A3,$22, $AB,$66, $26, $E6, $66,$66
-	.byte $62, $22, $66, $22, $26, $A4,$66, $E6
-	.byte $F2, $FE, $E2, $62, $66,$66, $26, $A3,$66
-	.byte $A5,$22, $AA,$66, $62, $2E, $EE, $6E, $66
-	.byte $22,$22, $66, $A6,$22, $2E, $FF,$FF, $7E, $A7,$26
-	.byte $22, $F6, $A3,$22, $A6,$66, $22, $A3,$EF, $66,$66
-	.byte $62, $66,$66, $22,$22, $66, $A5,$22, $62, $2E
-	.byte $22, $EE, $A9,$22, $FF, $A3,$22, $A6,$66, $22
-	.byte $A3,$EE, $66,$66, $A3,$26, $22,$22, $66, $22,$22, $62
-	.byte $66,$66, $26, $22, $66, $27, $66, $62
-	.byte $A7,$22, $FF, $A3,$22, $A6,$66, $22, $EE, $E2
-	.byte $EE, $22,$22, $A3,$F2, $22, $62, $22, $62
-	.byte $A3,$66, $26, $22, $72, $27, $22,$22, $66,$66
-	.byte $A6,$22, $FF, $A3,$22, $A6,$66, $22, $A3,$EE, $6F,$6F
-	.byte $A3,$66, $22, $26, $62, $22, $66,$66, $22,$22
-	.byte $72, $6E,$6E, $FF, $22, $26, $66, $6F
-	.byte $F2, $A4,$22, $26, $A3,$22, $A6,$66, $22, $A3,$EE
-	.byte $66,$66, $26, $66, $A3,$22, $26, $62, $A3,$22
-	.byte $72, $27, $66,$66, $EF, $22,$22, $A3,$66, $A3,$22
-	.byte $62, $A4,$22, $A6,$66, $22,$22, $EE,$EE, $FE, $66,$66
-	.byte $22,$22, $62, $26, $22, $26, $A3,$22, $77
-	.byte $22, $26,$26, $2E, $22,$22, $26, $62, $26
-	.byte $22,$22, $62, $26, $A4,$22, $A6,$66, $22,$22, $EE,$EE
-	.byte $FF, $66, $26, $22,$22, $66, $A4,$22, $72
-	.byte $27,$27, $AA,$22, $62, $26, $A5,$22, $A6,$66, $22,$22
-	.byte $EE, $2E, $A8,$22, $A3,$27, $AB,$22, $F2, $A7,$22
-	.byte $A6,$66, $AE,$22, $A3,$62, $22, $62,$62, $A4,$22, $E2
-	.byte $EE, $FF, $A7,$22, $A4,$66, $26, $A8,$22, $26
-	.byte $62, $A4,$22, $66, $22, $66, $22, $66
-	.byte $22,$22, $26, $22, $57, $27, $EE, $E6
-	.byte $FF, $A7,$22, $66,$66, $26, $AF,$22, $26, $66
-	.byte $22, $FE, $22, $6E, $A5,$22, $66, $EE,$EE
-	.byte $FF, $A7,$22, $26, $A0,$12,$22, $66, $22, $66
-	.byte $22, $26, $A6,$22, $EE,$EE, $FF, $A0,$1C,$22, $26
-	.byte $A4,$22, $62, $A3,$22, $EE,$EE, $FF, $A0,$1B,$22, $62
-	.byte $A4,$22, $26,$26, $A4,$22, $2F, $A0,$A8,$22
 	.byte $A1
 gone43_rle:	.byte $28 ; ysize=48
 	.byte $A0,$FF,$AA, $A0,$59,$AA, $77, $A0,$01,$A7, $A0,$26,$AA, $7A, $A0,$23,$AA

ootw/ootw_c2.s

@@ -74,6 +74,7 @@ end_message:
 .include "gr_fast_clear.s"
 .include "gr_copy.s"
 .include "gr_putsprite.s"
+.include "gr_putsprite_flipped.s"
 .include "gr_offsets.s"
 .include "random16.s"
 .include "keyboard.s"