From bbd254032b1f6436f3d745806167331ee9f846db Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 31 Jan 2023 19:40:53 -0800
Subject: [PATCH] Added b13 to neom

---
 README.md       |   2 +-
 etc/a/b/1.tga   | Bin 16428 -> 20524 bytes
 etc/a/b/13.tga  | Bin 20524 -> 20524 bytes
 etc/b.txt       |   2 +-
 src/oquonie.tal |  12 +++++-------
 src/world.tal   |   7 +++----
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 8375ad6..740da42 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Oquonie is larger than a standard 64kb rom, it makes use of the MMU. The current
 0002 floors, 64x40 sprites
 0003 steps, 64x40 sprites
 0004 characters, 64x80 sprites
-0005 blockers, 64x64 sprites
+0005 blockers, 64x80 sprites(500)
 0006 events, 64x80 sprites
 0007 portraits, 88x120 sprites
 0008 camilare, 32x32 sprites
diff --git a/etc/a/b/1.tga b/etc/a/b/1.tga
index bde654cac82b80d13c88d0b21d1f9249e2c24fca..d14bc49e7d856f3829c75599900f915b652c5f88 100644
GIT binary patch
delta 545
zcmah`O-lk%6dg@S%c+_11!{h$X*J?AEr`^FRuzc-fP|t|WzZ%F8j02+$=S4upxT5;
zV$de~1ua^&2%25dsvppzx-}L=iyl1QxgY1AdwBI7Q~k))D+p%6I7J~Z6q~&(Vw2C%
zy)>iTV?#l<qN?_{PQ|hUUFw9(FXA;|$F&lG9+j{ZsN=1#+w#7*y^D<z?@yuNVW<T6
z(dBLz=j93H`~hr+4$#%l5E^)<q7!#M6@~B>VMmQy5R5#ck@R4Yh95E&-04BZ;e;Ni
z*b&3IgFzpRk*FV$=z~FHD03Tf!v^KErNqKS<)|ulyoIgMhwONYPZFgMy4Q))&;efJ
zQ*GV_;b~|o5d|L^j*z4(A;%bAXv3;(ZJmweI}EK1w6u)bghXLCwnP~XmGt6aG!mKb
zmI)pt$gs}0f2YW!6<NiGN^<Q_MS?b3HnMqSQ!X;8VmGx++s)NDnWP`NmlCwVBE73M
no`yEIP~*ofZ9HN!h&M2_N$6jA`z7)<{G>g6waHy(xbw;f!40#-

delta 680
zcmZ3pfN@O&BR>NJ69WV|FaY63{w&_fy}mq?du<dpFO|&|;_j(w0?Gde;>jNkL?`c4
zQkZ<tTwrpN!5V&$984ZaPcF2Uh0FWth)k|CoPePwP|<R-oxZ~4GNTz_v!P~8mNfn-
z3^NZ#gY3MhXE@o<WDkZM$Ua%qm*PljLGA<tkes5q=;V1SI+G1FWG2@sOH96JD=>MU
zvc}{M$|95RnQ1VC)Fe79PS!HN0cLM>(VVPj@dwOSG?$!wPgi1coaGF5sQD8WEhgtW
za89<f+5%ECQPE*?tuyarKRu4geWpMgYy>9TsfbK|rzJ7DPmyEuDr*O3uu&fseJ9ts
z2u${}7Xb4MWhE!Cvk{pbXR9)KoxKgr_{ksbGr{t)4!sy+f)=uqs~ii^#V0B%Os;jx
zMF=~k!q{Lb=S-9U{^%SFj|{k{fF`&kA}gDyn2OAu%&4Y2xy>~MS!|->jLo%fs*I3u
qxHH+(K@o|GaKa6c3{LKy$+pgtsK!2-oGZr()38yomT9t7fDiz0J@<<M

diff --git a/etc/a/b/13.tga b/etc/a/b/13.tga
index 35fc9fe2ce8c70015702edef2da0e7845c1ca8d1..5174151e403f4196316b463f38dbe3dec7010418 100644
GIT binary patch
delta 22
ecmZ3pfN{+N#tjR_HqVu*HQs3Ohjp@4fDiz3LkSN6

delta 33
rcmV++0N($spaHC)0kEMKu`v7vlZ_Y%lieX~kuZp}ofm;JlNwMG_q`31

diff --git a/etc/b.txt b/etc/b.txt
index be526f0..180f2ce 100644
--- a/etc/b.txt
+++ b/etc/b.txt
@@ -1 +1 @@
-etc/a/b/1.tga 
+etc/a/b/1.tga etc/a/b/13.tga 
diff --git a/src/oquonie.tal b/src/oquonie.tal
index 8db10c9..3443968 100644
--- a/src/oquonie.tal
+++ b/src/oquonie.tal
@@ -411,7 +411,7 @@ JMP2r
 &draw ( e* -- )
 
 	( loc ) LDA get-coordinates
-		#0020 SUB2 .Screen/y DEO2
+		#0030 SUB2 .Screen/y DEO2
 		.Screen/x DEO2
 	[ LIT2 &sprite $2 ] draw-blocker
 
@@ -419,13 +419,13 @@ JMP2r
 
 &load ( e* -- )
 
-	POP2 ( TODO: )
+	#0003 ADD2 LDA #00 SWP #0500 MUL2 ,&src STR2
 	#0500 load-request STH2k ,&dst STR2
 	;&mmu #02 DEO2
 	STH2r ,&sprite STR2
 
 JMP2r
-	&mmu 01 0500 0005 $2 0000 &dst $2
+	&mmu 01 0500 0005 &src $2 0000 &dst $2
 
 @e/door =e/blank/draw =&collide =e/blank/load
 
@@ -1159,12 +1159,10 @@ JMP2r
 
 &walk
 
-
-
 	;cache/c
 		#0004 .player/dir LDZ #01 AND DUP ADD ADD
 		.timer/player LDZ #01 AND ADD
-( csize ) #0500 MUL2 ADD2
+		( csize ) #0500 MUL2 ADD2
 		.player/dir LDZ #01 SFT draw-character-auto
 
 JMP2r
@@ -1173,7 +1171,7 @@ JMP2r
 
 	.Screen/addr DEO2
 	#76 .Screen/auto DEO
-	#f8
+	#f6
 	&l
 		#85 .Screen/sprite DEO
 		INC DUP ?&l
diff --git a/src/world.tal b/src/world.tal
index f089b0c..cc43910 100644
--- a/src/world.tal
+++ b/src/world.tal
@@ -370,7 +370,7 @@
 		16 =e/gate =lobby/3 07 -spell/neomine $1
 		0f =e/door =neom/2 12 $2
 		05 =e/door =neom/3 08 $2
-		07 =e/blocker $5 ]
+		07 =e/blocker 01 $4 ]
 
 &2 =theme/neomine [
 	1e 1d 1e 20 20 20
@@ -433,7 +433,7 @@
 		0e =e/door =neom/8 0b $2
 		13 =e/door =neom/9 10 $2
 		0b =e/owl $5
-		06 =e/blocker $5 ]
+		06 =e/blocker 01 $3 ]
 
 &8 =theme/neomine [
 	06 06 06 1e 1d 1e
@@ -459,8 +459,7 @@
 	00 01 00 00 00 00
 	02 ( events )
 		0e =e/door =neom/9 0b $2
-		0a =e/gate =neom/warp 0d -spell/nestorine $1
-		]
+		0a =e/gate =neom/warp 0d -spell/nestorine $1 ]
 
 &warp =theme/warp [
 	02 03 02 02 03 02