From de5fd04033329658913079ed9451dc753d964020 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Mon, 27 Jan 2020 16:10:35 -0500
Subject: [PATCH] ootw: add placeholders for c6 and c12

---
 ootw/Makefile                                |   6 ++--
 ootw/ootw_c12.s                              |   6 ++--
 ootw/ootw_c6.s                               |   8 ++---
 ootw/ootw_graphics/l12room/Makefile          |  18 ++++++++++++
 ootw/ootw_graphics/l12room/house.png         | Bin 0 -> 404 bytes
 ootw/ootw_graphics/l12room/ootw_c12_room.inc |  29 +++++++++++++++++++
 ootw/ootw_graphics/l6cave/Makefile           |  18 ++++++++++++
 ootw/ootw_graphics/l6cave/cave.png           | Bin 0 -> 297 bytes
 ootw/ootw_graphics/l6cave/ootw_c6_cave.inc   |  15 ++++++++++
 9 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 ootw/ootw_graphics/l12room/Makefile
 create mode 100644 ootw/ootw_graphics/l12room/house.png
 create mode 100644 ootw/ootw_graphics/l12room/ootw_c12_room.inc
 create mode 100644 ootw/ootw_graphics/l6cave/Makefile
 create mode 100644 ootw/ootw_graphics/l6cave/cave.png
 create mode 100644 ootw/ootw_graphics/l6cave/ootw_c6_cave.inc

diff --git a/ootw/Makefile b/ootw/Makefile
index af4d24a4..e7b3d8cd 100644
--- a/ootw/Makefile
+++ b/ootw/Makefile
@@ -150,7 +150,7 @@ ootw_c6.o:	ootw_c6.s \
 	keyboard.s gr_run_sequence.s physicist.s \
 	collision.s door.s gun.s blast.s shield.s \
 	ootw_graphics/sprites/physicist.inc \
-	ootw_graphics/l14arena/ootw_c14_arena.inc
+	ootw_graphics/l6cave/ootw_c6_cave.inc
 	ca65 -o ootw_c6.o ootw_c6.s -l ootw_c6.lst
 ###
 
@@ -232,7 +232,7 @@ ootw_c12.o:	ootw_c12.s \
 	keyboard.s gr_run_sequence.s physicist.s \
 	collision.s door.s gun.s blast.s shield.s \
 	ootw_graphics/sprites/physicist.inc \
-	ootw_graphics/l14arena/ootw_c14_arena.inc
+	ootw_graphics/l12room/ootw_c12_room.inc
 	ca65 -o ootw_c12.o ootw_c12.s -l ootw_c12.lst
 
 ###
@@ -246,7 +246,7 @@ ootw_c13.o:	ootw_c13.s \
 	keyboard.s gr_run_sequence.s physicist.s \
 	collision.s door.s gun.s blast.s shield.s \
 	ootw_graphics/sprites/physicist.inc \
-	ootw_graphics/l14arena/ootw_c14_arena.inc
+	ootw_graphics/l13room/ootw_c13_room.inc
 	ca65 -o ootw_c13.o ootw_c13.s -l ootw_c13.lst
 
 
diff --git a/ootw/ootw_c12.s b/ootw/ootw_c12.s
index 3a0e2815..9b12c68e 100644
--- a/ootw/ootw_c12.s
+++ b/ootw/ootw_c12.s
@@ -169,9 +169,9 @@ room:
 	sta	PHYSICIST_Y
 
 	; load background
-	lda	#>(arena_rle)
+	lda	#>(house_rle)
 	sta	GBASH
-	lda	#<(arena_rle)
+	lda	#<(house_rle)
 
 	jmp	room_setup_done
 
@@ -518,7 +518,7 @@ end_message:
 .include "collision.s"
 
 ; room backgrounds
-.include "ootw_graphics/l14arena/ootw_c14_arena.inc"
+.include "ootw_graphics/l12room/ootw_c12_room.inc"
 ; sprites
 .include "ootw_graphics/sprites/physicist.inc"
 .include "ootw_graphics/sprites/alien.inc"
diff --git a/ootw/ootw_c6.s b/ootw/ootw_c6.s
index b1d537ad..656a5dcb 100644
--- a/ootw/ootw_c6.s
+++ b/ootw/ootw_c6.s
@@ -165,13 +165,13 @@ room:
 	lda     #0
 	sta     cel_smc+1
 
-	lda	#28
+	lda	#16
 	sta	PHYSICIST_Y
 
 	; load background
-	lda	#>(arena_rle)
+	lda	#>(cave_rle)
 	sta	GBASH
-	lda	#<(arena_rle)
+	lda	#<(cave_rle)
 
 	jmp	room_setup_done
 
@@ -518,7 +518,7 @@ end_message:
 .include "collision.s"
 
 ; room backgrounds
-.include "ootw_graphics/l14arena/ootw_c14_arena.inc"
+.include "ootw_graphics/l6cave/ootw_c6_cave.inc"
 ; sprites
 .include "ootw_graphics/sprites/physicist.inc"
 .include "ootw_graphics/sprites/alien.inc"
diff --git a/ootw/ootw_graphics/l12room/Makefile b/ootw/ootw_graphics/l12room/Makefile
new file mode 100644
index 00000000..a6bc833f
--- /dev/null
+++ b/ootw/ootw_graphics/l12room/Makefile
@@ -0,0 +1,18 @@
+include ../../../Makefile.inc
+
+PNG2RLE = ../../../gr-utils/png2rle
+PNG2LZ4 = ../../../gr-utils/png2lz4
+
+all:	ootw_c12_room.inc
+
+#####
+
+ootw_c12_room.inc:	$(PNG2RLE) \
+	house.png
+	$(PNG2RLE) asm house.png house_rle > ootw_c12_room.inc
+
+#####
+
+clean:		
+		rm -f *~ *.o *.lst *.lzz *.inc
+
diff --git a/ootw/ootw_graphics/l12room/house.png b/ootw/ootw_graphics/l12room/house.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcdc967a4ff47d273fb3ba6b5188685aa310ddd4
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^0YGfP!VDx!PCqyT;sp4FxB}_NatR53d;h!qWmudr
zXU-gv^M5ZK{-039{6EWP?%cWm7hDkeYIEUkZ_)n?|Ns9_WS?0J)Wcce5n0T@AiN%g
z8Izy&9R>=rmw5WRvOi&z7SWcLaW*vu3Q3l@MwB?`=jNv7l`uFLr6!i7rYMwWmSiZn
zd-?{1H}Z)C6<zXlaSX9IefH{Y-opw!tO4hX(ob^5E!3`HU4J1ro4N9Xm%z$d_v8g+
zBs)BuTw2UI=CS^rpl+G-mUW5ujtldGEgmdWWK)!D{$X~cRzr!|&q+<8jv-R$h{zMM
zCu~QwTT|akes%lwoMVbX2=4?w1KwL(-sY6s&2SENT_L9KeEj&V0_*fQD~=uHii+6s
zBEo2e`cL5%=N(I?+J4`7_{J51E#EEMU*C#3l3!AI_7Up}ZZXl?!YySH&RfbOoG+Cf
vWPTF&Nd3&MJ&!yu{j6U3U)S6?`U7*s)0sP?r(KZ-`i{ZV)z4*}Q$iB}*m$9S

literal 0
HcmV?d00001

diff --git a/ootw/ootw_graphics/l12room/ootw_c12_room.inc b/ootw/ootw_graphics/l12room/ootw_c12_room.inc
new file mode 100644
index 00000000..54d55ec7
--- /dev/null
+++ b/ootw/ootw_graphics/l12room/ootw_c12_room.inc
@@ -0,0 +1,29 @@
+house_rle:	.byte $28 ; ysize=48
+	.byte $A3,$00, $02, $29, $02, $20, $A5,$22, $24
+	.byte $02, $A0,$1A,$22, $A4,$00, $42, $00, $A5,$02, $00
+	.byte $02, $00, $02,$02, $A0,$18,$22, $AF,$00, $A0,$19,$22, $AD,$00
+	.byte $20, $A0,$1A,$22, $AD,$00, $A0,$1B,$22, $AC,$00, $A0,$1C,$22, $AB,$00
+	.byte $A0,$1A,$22, $A3,$72, $AA,$00, $A0,$18,$22, $A6,$77, $A9,$00, $A0,$19,$22
+	.byte $A6,$77, $A9,$00, $A0,$12,$22, $55, $77, $A5,$22, $77,$77
+	.byte $22, $A3,$77, $A8,$00, $25, $A8,$62, $52, $72
+	.byte $A8,$62, $25, $27, $55, $A4,$62, $77, $27
+	.byte $22, $A3,$77, $A7,$00, $20, $22,$22, $26, $A5,$66
+	.byte $26, $55, $77, $26, $A5,$66, $26, $A5,$22
+	.byte $26, $66,$66, $77, $22, $00, $A3,$77, $A7,$00
+	.byte $A3,$88, $22, $26,$26, $55, $77, $26, $A4,$22
+	.byte $26,$26, $55, $77, $26, $22, $82, $A3,$88
+	.byte $82, $22, $26,$26, $77, $22, $00, $A3,$77
+	.byte $A6,$00, $80, $A6,$88, $85, $87, $A7,$88, $85
+	.byte $87, $AA,$88, $77, $22, $00, $A3,$77, $A6,$00
+	.byte $A0,$1C,$88, $77, $22, $00, $A3,$77, $A5,$00, $80
+	.byte $A0,$1C,$88, $77, $22, $00, $A3,$77, $A5,$00, $A0,$1D,$88
+	.byte $77, $22, $00, $A3,$77, $A5,$00, $02, $A0,$19,$88
+	.byte $02,$02, $88, $77, $22, $00, $A3,$77, $A6,$00
+	.byte $28, $A7,$88, $A0,$10,$58, $02,$02, $00, $58, $77
+	.byte $22, $00, $A3,$77, $A7,$00, $02, $88,$88, $28
+	.byte $A3,$82, $AF,$88, $02,$02, $00,$00, $88, $77, $22
+	.byte $00, $A3,$77, $A8,$00, $02, $A0,$13,$88, $02,$02, $A3,$00
+	.byte $88, $77, $22, $00, $A3,$77, $00,$00, $A0,$19,$05
+	.byte $02,$02, $A4,$00, $05,$05, $02, $50, $A3,$57, $A0,$1A,$00
+	.byte $02,$02, $A0,$25,$00, $02,$02, $AD,$00
+	.byte $A1
diff --git a/ootw/ootw_graphics/l6cave/Makefile b/ootw/ootw_graphics/l6cave/Makefile
new file mode 100644
index 00000000..d5a2c32d
--- /dev/null
+++ b/ootw/ootw_graphics/l6cave/Makefile
@@ -0,0 +1,18 @@
+include ../../../Makefile.inc
+
+PNG2RLE = ../../../gr-utils/png2rle
+PNG2LZ4 = ../../../gr-utils/png2lz4
+
+all:	ootw_c6_cave.inc
+
+#####
+
+ootw_c6_cave.inc:	$(PNG2RLE) \
+	cave.png
+	$(PNG2RLE) asm cave.png cave_rle > ootw_c6_cave.inc
+
+#####
+
+clean:		
+		rm -f *~ *.o *.lst *.lzz *.inc
+
diff --git a/ootw/ootw_graphics/l6cave/cave.png b/ootw/ootw_graphics/l6cave/cave.png
new file mode 100644
index 0000000000000000000000000000000000000000..691a7d2917d755735bf926e935db40045ebe8051
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^0YGfP!VDx!PCqyT;sp4FxB}_NatR53d;h!qWmudr
zXU-gv^M5ZK{-039{6EWP?%cWm7hDkeYIEUkZ_)n?|Ns9_WS?0J)Wcce5n0T@AiN%g
z8Izy&9R>=rmw5WRvOi&z7G;%6Y)sn+6p}1)jVN)>&&^HED`9XhN=+<DO;IS%EXh!C
z_w)@2Z{!mPDoXcsaSX9I{dTe=7lR@X^XF+lC;$K7rNqshq_`vWTf&}`0<%Syx-ZR8
zyCs<yV^DO2HP(GDgW<siau1uL*geaA*#90%ZBl&Jl%M;>^|1xhO8@lMpA4V28$_|b
mynN>ApXrLzY>!^Onikp~FDjq<aPtJ9l?<M)elF{r5}E)~zHv<e

literal 0
HcmV?d00001

diff --git a/ootw/ootw_graphics/l6cave/ootw_c6_cave.inc b/ootw/ootw_graphics/l6cave/ootw_c6_cave.inc
new file mode 100644
index 00000000..d8277290
--- /dev/null
+++ b/ootw/ootw_graphics/l6cave/ootw_c6_cave.inc
@@ -0,0 +1,15 @@
+cave_rle:	.byte $28 ; ysize=48
+	.byte $A8,$00, $25, $55, $A0,$15,$00, $22, $00, $22
+	.byte $AE,$00, $55,$55, $A0,$15,$00, $22, $02, $22, $AE,$00
+	.byte $55,$55, $A0,$17,$00, $22, $AE,$00, $55, $25, $A0,$17,$00
+	.byte $22, $AE,$00, $22, $55, $A0,$16,$00, $02, $22
+	.byte $AE,$00, $22, $25, $A0,$17,$00, $22, $AE,$00, $22
+	.byte $55, $A0,$17,$00, $22, $AE,$00, $52, $55, $A0,$17,$00
+	.byte $22, $AE,$00, $05, $A0,$16,$00, $20, $00, $22
+	.byte $A7,$00, $20, $A3,$00, $50, $20,$20, $A0,$17,$00, $22
+	.byte $02, $22, $A9,$00, $A3,$02, $A0,$19,$00, $22, $20
+	.byte $22, $A0,$25,$00, $22, $00, $22, $AF,$00, $20
+	.byte $A0,$15,$00, $22, $00, $22, $A0,$25,$00, $22, $02
+	.byte $22, $A0,$27,$00, $22, $AA,$00, $20,$20, $02, $00,$00
+	.byte $A0,$19,$02, $A6,$00, $A4,$02, $A0,$FF,$00, $A0,$3D,$00
+	.byte $A1