From 0d6c1f59cf80782642a8d8da6f2b30c285711019 Mon Sep 17 00:00:00 2001
From: Lukas Myers <lukaskrickl@gmail.com>
Date: Wed, 24 Jan 2018 15:48:20 +0100
Subject: [PATCH] Added more maps

---
 gfx/room00_pf0.png | Bin 0 -> 192 bytes
 gfx/room00_pf1.png | Bin 0 -> 212 bytes
 gfx/room01_pf0.png | Bin 941 -> 245 bytes
 gfx/room01_pf1.png | Bin 941 -> 222 bytes
 gfx/room01_pf2.png | Bin 941 -> 214 bytes
 gfx/room02_pf1.png | Bin 183 -> 185 bytes
 gfx/room02_pf2.png | Bin 0 -> 230 bytes
 gfx/room03_pf0.png | Bin 0 -> 187 bytes
 gfx/room03_pf1.png | Bin 0 -> 201 bytes
 gfx/room03_pf2.png | Bin 0 -> 204 bytes
 main.asm           | 287 +++++++++++++++++++++++++++++----------------
 11 files changed, 184 insertions(+), 103 deletions(-)
 create mode 100644 gfx/room00_pf0.png
 create mode 100644 gfx/room00_pf1.png
 create mode 100644 gfx/room02_pf2.png
 create mode 100644 gfx/room03_pf0.png
 create mode 100644 gfx/room03_pf1.png
 create mode 100644 gfx/room03_pf2.png

diff --git a/gfx/room00_pf0.png b/gfx/room00_pf0.png
new file mode 100644
index 0000000000000000000000000000000000000000..331d5cf9fe223c6029d7d9f1306b83a051085623
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!2~3mpZ|CSq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mPJ|2Zd7g*GRLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG(
zDmzfz%+tj&MB{vNiUZUC|Nq-JOHQ;r(a_1ren9hJ$7wz>i}s0vu7ax57E8MBDrR5K
fBHG+isPI^ZVT!Y~wDa7g4v^8Fu6{1-oD!M<(l|69

literal 0
HcmV?d00001

diff --git a/gfx/room00_pf1.png b/gfx/room00_pf1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4068c924f49c348a95a5fac12d5f7b0941deacd4
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!2~3mpZ|CSq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mPJ^`-zG85JSg=8~BB1)X|b8}PkN`PDj2Ir#G#FEq$h4Rdj3<Y;j-+&ao
zRCb`am#2$kh{pM=f$m%k3OwFN{?}W|%?as#<Y+Mc-LmFM3=>>jKc*NeA2{gP@Z`jo
zrsVL8Mb#IJv^>j$XXf4HX<Mn8xBC1)!MB00`#7gKsH+M#y*m!F&ePS;Wt~$(698P-
BLZ1Kt

literal 0
HcmV?d00001

diff --git a/gfx/room01_pf0.png b/gfx/room01_pf0.png
index 8ca1616beddd5d267f6887f19845e94ee229e073..4ea3fc5ff47f8b10c00231dfd7ed826f78591d35 100644
GIT binary patch
delta 149
zcmZ3>{*`fp3O`$tx4R1i82ohJT|ZG#fkT3iRh7BI`{6`S?R<tvPZ!4!jq_V4UgUBx
z<Zvqf@;_dtB>t#rO2PHnk0+R2yen(M5aG6I#i|53hcyPwTLY|jD=shCQ}XfglWmb2
zDaI8J^?qOZ#b*6FC>rdzty|Dy>pz7jrW4+s;de4t*4VN$?kdP`Pgg&ebxsLQ0P3we
AHvj+t

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=!3HFc-`pbrq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mXVPhpPjRR|dLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG(
zDmw!Mv$Cg)V~B<*qXhHwKa4<i|G}!E#Q*;&Tm}}9IJzLR1}0<<Ha0;8U@Krc85u!N
zf&iGcC<;JQFbSwS27*?gC_vW@G6h8e%vfZaGzG}M0GR^f6Ep!F7uXyJa|b~aNK=6B
zNRTz8nE=uOG6mTrl*q#78`7-+S%VBHH-TWXKXzPNH$rG;706moS3j3^P6<r_H$Odg

diff --git a/gfx/room01_pf1.png b/gfx/room01_pf1.png
index f9db4f773d64eb4080c7e09c29c1f24a27d33a02..0d36d17b57f5bc2443ab6f7f83676e7ed053a555 100644
GIT binary patch
delta 126
zcmZ3>evfg23O`$tx4R1i82ohJT|ZG#fkT3iMX81TJ@Z6Q?Fa@ZPZ!4!jq}NW{{R19
z&t}um*~qY<nMq8ddE!Jt=TAUE4%Qd*8Z#HPD{r*yI~DezOS`H{I6h{9#(}3d4o+Ca
ap~b-P{jh+wHLoQL$P!OiKbLh*2~7YWT`uGR

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=!3HFc-`pbrq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mXVM~tenui~NLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG(
zDmw!Mv$Cg)V~B<*qXhHwKaBr@0IV7Z!GuE`E=;)s7MNL#jEpcQoCY}$t^nPwFb$Nu
zfpQaAV2*)19gRWI3Kn$l!3=<zOwa^6D1gTW%uz5$!f3bxT)v@$BPq8+ak+qX$nOs#
PAYXa9`njxgN@xNARwXlD

diff --git a/gfx/room01_pf2.png b/gfx/room01_pf2.png
index 54532458c1bba8fb3d5f8c48db8d4dff1868943d..fbfae6dc5dbe70d39fb1f03bc34ac58ff136106f 100644
GIT binary patch
delta 118
zcmZ3>evNU03O`$tx4R1i82ohJT|ZG#fkT3iP5Aly-rW;DwF4NeJY5_^G|ngg`Tzfa
zJ)2EKXCs5ciU!tW2`MQ@CIAKPofv%@e&tDo8dQiZa51l%<>1M`W0IPz3@5{P5dppP
S_inI&4EJ>Pb6Mw<&;$V4MJp}<

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=!3HFc-`pbrq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mXVN039Wv0DAA=%83h!W@g+}zZ>5+Ij>!MP|ku_QG`p**uBL&4qCHy}kX
zm7RfsS=rOYF+@X@QG)sTAIASc09K8IV8S5|7iNL67#SI1OgIfP9IgN)ip@5HR*Wiu
s1nBSx2bA=Ho@h`K47S7q3JE%d!(JBwz3d;ekAbZ7boFyt=akR{07*16BLDyZ

diff --git a/gfx/room02_pf1.png b/gfx/room02_pf1.png
index ecf9448406691f409131e56fc949abfb42600137..17f29481e65747b6eead950cc66a8917d9f6ddf7 100644
GIT binary patch
delta 87
zcmdnaxRY^$BZmZ^KJz{~CX<PtIxhO2E{-7@=ac{Z|8LI>2Fl9HKzh#UBMr;}flP_g
mvlNuWIHPVFzAAq8TZW<HnEqd1#(SF>fWXt$&t;ucLK6U*&Kzw3

delta 85
zcmdnVxSer=BZnv#i(DM{<JO6uI!?NtE{-7@=aYZ@|8LLC1|pSXnkG&ZRAPB(WcYv~
nWJ-d<8!as<(^rnKels)Za9O`?UU}pW0}yz+`njxgN@xNAUWOoM

diff --git a/gfx/room02_pf2.png b/gfx/room02_pf2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e5c2ab667f0e177bae45294ee0d4c37e9606ee
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!2~3mpZ|CSq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mPK2_GWll;4ZLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG(
zDmzd-#?!?yMC1J02?zNOC~!Fc=J@~r<fi6sJuY_fYQ-&_xr$0t4u&icDRN=?ZsXPX
za2m^vo4Z%qtkv~gYwCG`hpXZH#iyAGX;(FG-`<-pUiRhd#+twB{jIEZd;b3D<hR{t
U$(JCpGX&%SPgg&ebxsLQ0K8pG)Bpeg

literal 0
HcmV?d00001

diff --git a/gfx/room03_pf0.png b/gfx/room03_pf0.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd95c08fb7890d2e1e6e548b4e34ea5d1fa0601
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!2~3mpZ|CSq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mPJ_Wg`h9V`PkZfj1M2T~LZf<H`36RUc;9QiNSdyBeP@Y+mq2TW68<3)x
z$_^Aa^mK6y(Kw&{=l_3uX0roF8kh|X4Gav7j3%u}{^03Q+wij9ZBtWA$?1(z&itp@
auk2*lzEf06F5<x~kg1-oelF{r5}E)5+ciG`

literal 0
HcmV?d00001

diff --git a/gfx/room03_pf1.png b/gfx/room03_pf1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4b2244b59e232c5339291b02c3e245213d06010
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!3HFGTJyI8Db50q$YKTtZeb8+WSBKa0w~B{
z;_2(k{)kb6Pl;zXf8q<EkZfj1M2T~LZf<H`36RUc;9QiNSdyBeP@Y+mq2TW68<3)x
z$_^B__jGX#(Kvs1f+H7$f&kO;7ysk8W#?XqTcp%))S-1dZK2a5@dhr1OoQKvrc#3U
pE-1SBIehxkxtQfglBehVGdbDrqQ*aajD10Nc)I$ztaD0e0st-cIYa;e

literal 0
HcmV?d00001

diff --git a/gfx/room03_pf2.png b/gfx/room03_pf2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4625e9d535b53f75a0550e5aece26dc823959c7
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!2~3mpZ|CSq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`y)mPK2?L?irp)KLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG(
zDmzfz$<xI#MC1J435I+O1{_RFKmLzjHoLj?;E^eTP3{aQ1FRBLcy%Y;NRD836=uEn
tdU@DG3C&!FVz;nue|?VMpHpk|i1ok^b>5!9zsVqLJYD@<);T3K0RTUGJ&ynY

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 77ffc89..6a4e7b5 100644
--- a/main.asm
+++ b/main.asm
@@ -117,7 +117,7 @@ P1STARTX = 0
 P1STARTY = 0
 M0HEIGHT = 4
 M0RESPAWNT = 255
-MAPCOUNT = 3
+MAPCOUNT = 4
 OFFSETPERMAP = 6
 
 ; music volumes
@@ -690,7 +690,7 @@ DownCollision
 	; up pressed code
 	ldx ObjectY,y
 	inx
-	cpx #PFHEIGHT+1 ; used to be $60 - works with $FF too because this is the edge of the screen
+	cpx #PFHEIGHT+3 ; used to be $60 - works with $FF too because this is the edge of the screen
 	bne SaveYUp
 	ldx #0
 SaveYUp
@@ -1018,11 +1018,11 @@ NextMap
 	; this is the old code to pick a static map
 	jsr Random
 	lda Rand8
-	and #MAPCOUNT ; only allow MAPCOUNT for roll
+	and #MAPCOUNT-1 ; only allow MAPCOUNT for roll
 	tay
 	cpy #0 ; 0 does not require an offset
 	beq NextMapDone
-	dey
+	;dey
 	lda #OFFSETPERMAP
 	sta Temp
 	lda #0
@@ -1494,8 +1494,14 @@ DigitGfx:
 ; All rooms require PF1 and PF2 tables as well
 ; Reminder that pf0 only uses 4 bits
 Room0LayoutPF0:
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
 	.byte %11110000
 	.byte %00010000
+	.byte %00000000
+	.byte %00000000
 	.byte %00010000
 	.byte %00010000
 	.byte %00010000
@@ -1505,48 +1511,42 @@ Room0LayoutPF0:
 	.byte %00010000
 	.byte %00010000
 	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
+	.byte %00000000
+	.byte %00000000
 	.byte %00010000
 	.byte %11110000
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %11110000
 Room0LayoutPF1:
-	.byte %11111111
 	.byte %00000000
 	.byte %00000000
-	.byte %00111000
 	.byte %00000000
 	.byte %00000000
+	.byte %00011000
 	.byte %00000000
-	.byte %11000000
-	.byte %01000000
-	.byte %01000000
-	.byte %01000001
-	.byte %01000001
-	.byte %01000000
-	.byte %01000000
-	.byte %11000000
 	.byte %00000000
 	.byte %00000000
+	.byte %00011000
+	.byte %00011000
+	.byte %00111100
+	.byte %01111110
+	.byte %01111110
+	.byte %01111110
+	.byte %00111100
+	.byte %00011000
+	.byte %00011000
 	.byte %00000000
-	.byte %00111000
 	.byte %00000000
 	.byte %00000000
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
+	.byte %00011000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00111100
 Room0LayoutPF2:
-	.byte %11111111
+	.byte %00000000
 	.byte %10000000
 	.byte %00000000
 	.byte %00000000
@@ -1567,50 +1567,50 @@ Room0LayoutPF2:
 	.byte %00000000
 	.byte %00000000
 	.byte %10000000
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
 
 Room1LayoutPF0
-	.byte %000001111
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %000111001
-	.byte %000001001
-	.byte %000001001
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %010001001
-	.byte %010001001
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %000001001
-	.byte %000001001
-	.byte %000111001
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %000000001
-	.byte %000001111
+	.byte %00001111
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00111001
+	.byte %00001001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %10001001
+	.byte %10001001
+	.byte %10001001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00001001
+	.byte %00111001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00001111
 Room1LayoutPF1
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
+	.byte %00000000
 	.byte %00111110
 	.byte %00000010
 	.byte %00000010
 	.byte %00000010
 	.byte %00000010
-	.byte %00000010
 	.byte %11111110
 	.byte %11111110
-	.byte %00000010
+	.byte %11111110
 	.byte %00000010
 	.byte %00000010
 	.byte %00000010
@@ -1623,6 +1623,7 @@ Room1LayoutPF1
 	.byte %00000000
 	.byte %00000000
 Room1LayoutPF2
+	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00111110
@@ -1641,7 +1642,6 @@ Room1LayoutPF2
 	.byte %00100000
 	.byte %00100000
 	.byte %00100000
-	.byte %00100000
 	.byte %00111110
 	.byte %00000000
 	.byte %00000000
@@ -1649,83 +1649,161 @@ Room1LayoutPF2
 	.byte %00000000
 
 Room2LayoutPF0:
-	.byte %11110000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %00010000
-	.byte %11110000
-	.byte %11111111
-	.byte %11111111
-	.byte %11111111
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
 Room2LayoutPF1:
-	.byte %11111111
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %01111110
 	.byte %00000000
 	.byte %00000000
-	.byte %00111000
+	.byte %00000000
+	.byte %01111110
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %01111110
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %01111110
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+	.byte %00011000
+Room2LayoutPF2:
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %11111110
+	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %11000000
+	.byte %00111110
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %01011100
+	.byte %00000000
+	.byte %00000000
+	.byte %01000000
+	.byte %01111001
+	.byte %00000001
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+
+Room3LayoutPF0:
+	.byte %00000000
+	.byte %00000000
+	.byte %01000000
+	.byte %01000000
+	.byte %01000000
+	.byte %01000000
 	.byte %01000000
 	.byte %01000000
-	.byte %01000001
-	.byte %01000001
 	.byte %01000000
 	.byte %01000000
 	.byte %11000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
-	.byte %00111000
 	.byte %00000000
+	.byte %10000000
 	.byte %00000000
-	.byte %11111111
 	.byte %00000000
-	.byte %11111111
 	.byte %00000000
-Room2LayoutPF2:
-	.byte %11111111
-	.byte %10000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
+	.byte %10000000
 	.byte %00000000
-	.byte %00011100
-	.byte %00000100
 	.byte %00000000
+Room3LayoutPF1:
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
-	.byte %00000100
-	.byte %00011100
+	.byte %00000000
+	.byte %01111000
+	.byte %00001000
+	.byte %00001000
+	.byte %00001000
+	.byte %11111000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
 	.byte %00000000
-	.byte %10000000
 	.byte %11111111
 	.byte %00000000
+	.byte %00000000
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
 	.byte %11111111
 	.byte %00000000
+	.byte %00000000
+Room3LayoutPF2:
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %11111110
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %11000000
+	.byte %00111110
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %00000000
+	.byte %01111111
+	.byte %01000001
+	.byte %01000001
+	.byte %01000001
+	.byte %01111001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000001
+	.byte %00000000
+	.byte %00000000
 
 ; Table holding all the room start addresses next to each other
 ; might be able to store this in 3 different tables and not have the counter
@@ -1742,6 +1820,9 @@ RoomTable:
 	.word Room2LayoutPF0
 	.word Room2LayoutPF1
 	.word Room2LayoutPF2
+	.word Room3LayoutPF0
+	.word Room3LayoutPF1
+	.word Room3LayoutPF2
 ROOMTABLESIZE = * - RoomTable
 
 ; Sound tables
-- 
2.30.2