From a32d37a23300e4dbae7cdf155ed0694129c35dc4 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 30 May 2021 06:43:52 -0500
Subject: [PATCH] Minor reorganization of code/data placement

---
 BaseClasses.py        |   8 ++++----
 Rom.py                |   2 +-
 asm/owrando.asm       |   9 +++++----
 data/base2current.bps | Bin 137015 -> 137015 bytes
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index d1c17187..b41ce608 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1559,10 +1559,10 @@ class OWEdge(object):
 
     def getAddress(self):
         base_address = {
-            Direction.North: 0x153800,
-            Direction.South: 0x153800 + (0x42 * 16),
-            Direction.West: 0x153800 + (0x84 * 16),
-            Direction.East: 0x153800 + (0xcf * 16),
+            Direction.North: 0x152800,
+            Direction.South: 0x152800 + (0x42 * 16),
+            Direction.West: 0x152800 + (0x84 * 16),
+            Direction.East: 0x152800 + (0xcf * 16),
         }
         return base_address[self.direction] + (self.edge_id * 16)
 
diff --git a/Rom.py b/Rom.py
index 3ffaea03..8f12da64 100644
--- a/Rom.py
+++ b/Rom.py
@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '081bd865c18f390a369248797fedd2d4'
+RANDOMIZERBASEHASH = '287a85bc8ba1815c2e9b41d0cd79b869'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index e1d663bd..161006de 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -1,7 +1,7 @@
 org $aa8000 ;150000
 db $4f, $52 ;OR
 OWMode:
-db 0
+dw 0
 OWFlags:
 dw 0
 org $aa8010
@@ -13,7 +13,7 @@ org $02a999
 jsl OWEdgeTransition : nop #4 ;LDA $02A4E3,X : ORA $7EF3CA
 
 ;Code
-org $aaa000
+org $aa8800
 OWCoordIndex: ; Horizontal 1st
 db 2, 2, 0, 0 ; Coordinate Index $20-$23
 OWOppCoordIndex: ; Horizontal 1st
@@ -35,6 +35,7 @@ db 2, 2, 0, 0 ; For OWCameraRange
 OWCameraRange:
 dw $011E, $0100 ; Length of the range the camera can move on small screens
 
+org $aa9000
 OWEdgeTransition:
 {
     php : phy
@@ -219,7 +220,7 @@ OWNewDestination:
 }
 
 ;Data
-org $aab000
+org $aaa000
 OWEdgeOffsets:
 ;2 bytes per each direction per each OW Slot, order is NSWE per value at $0418
 ;AABB, A = offset to the transition table, B = number of transitions
@@ -371,7 +372,7 @@ dw $0000, $4001, $0000, $0000
 dw $0000, $0000, $0000, $4a01
 dw $0000, $4101, $0000, $0000
 
-org $aab800 ;PC 153800
+org $aaa800 ;PC 152800
 OWNorthEdges:
 ;   Min    Max   Width   Mid OW Slot/OWID VRAM *FREE* Dest Index
 dw $00a0, $00a0, $0000, $00a0, $0000, $0000, $0000, $0040 ;Lost Woods
diff --git a/data/base2current.bps b/data/base2current.bps
index 7fe3f717c9b4f3012db4e1dff07db243463dc447..9c9e4cdf5c93e552487e499b45e9d59d18705f10 100644
GIT binary patch
delta 1513
zcmW-heN0nl6vp3k+uK_xg@UC*Tj0_m=)gh+wTd5=pjHqpC=Lxy6Eswr3VsDt<lfDi
z5=7B!d6lXa8dfM2tD+a3TB9*8COTb~nassF$`Yc>WavHwY*+o~dCrsk^89gfa`=8R
z-!Jyg2H{VM>Azi>2d{uYtyiWA%>U%w+_#ltI;o0>C$%%1oKW@ZlK4Le%0`I*K_HY^
zz-;s;-K;ZCJ{7OONHFeEktVU#%?LHIt?vEPtIzK}XyYEfPZsQ1)Wp4cubh=lH_v0j
zE5RL!DDx2QLl@jLf}=X)$j7OL$m@}{2=dH#=@~)PugEjfo>ne*T-g|EtM<eRpQQRw
zw|oA5jo0WSy509Rtp;CYx4V0Y?r}F8dpqeqy5dAHvw!}R&wX^?Cvcxn)AteF;nVgx
z7igNL%rBj&JA{q*GOL)f`JqaKH$>9j6}~*L`##;e#8>QfahA~m?r=+rFJvPvvd?^D
z1IMi`Dqmp0WwjW*-0*k?krvLyOyp-<uhKJ6z!=gX;L-#&)1mhZj9sFS@h)pS?s;Sp
z-4<J~4#ibMrNB0HTV~~&CRS*yaSbU}?%4_b-$PziuY$3}RoV|9f86}TiMv_X)z;pq
zDDK@vI+2yaB~Plr$}OCv<@Kfn=IJe&C{%S$CNd9YU5~SJwUe<k)BXCS;I%aye2xgi
z$!GPurZBywYfjmBuRHA6ByYzR%a7URx}JyIO?~!dsocQiT%fo=CX;AW1k;Whd5aV#
z%1YHt3q&E*wr%r;i~B=~tJiYrAL1dCTlyh%9Nd8q<?47jV@pK{XgFWH<XhK47N_S7
zI+Ln;@Mbml=EGEpO3t_vm2!rgt>&TwE2ItWEb)9{gpU>2H$`w&fi$A-Cf6EJezd+o
z0!X-rfqaPMqJj!y>pd<lSV?U7i#r<J5GfltH(jEa$WWF9SID@3gH^D|wh?B?a+<po
z$SU%RrlYeWTqv=f20iF(Pa%O=KWrNXb?)xp*(7J<5lcZqyWZ0-t-fP1nQ+M$euuo=
zk2f7*HO`GkEF~p4JvxeUXhUKtEya6N-a6`1@N$5Kq^{XfuER|L^<<>qfub-)Kx%1~
zpIziEuliK6*x7i@u{e3e@n!M|o|iku3Y_zE$L#BJ$DHN4V{L_dJS^!vhLagq^xfAi
z<<u~^-sES+&iy7ojxX`EVNPX<pKl}}2dFJ_#-ZFI$2SD9U0ma54NiTHA7=_7Emu3(
zWkz*KhH4N=;u!7V88fmX8r8K^ijE!v#R<#;6EX;-Sf`aU=a5Ng73$Gf_85a4pAf=q
zZOm|&7}W?*lhZ*+V!dG46NZ=&Bu0mY3I&dxGj_%+l#!dzOS^K}82?TP=LuDY-;tH!
z$9vTyu086Jw(PzAuA{hCWOvnwcn<}yK@#@1bNSkyN}W>}&O5{4RrHh<Z~ILRO&tbA
zQ5u9$wM*N8FR0*8spN)!$7@Si_!Ne$AH(O>Ff7_~ef1Ej<E;tch$a)y+H0jaBNH4{
zbZ8N2TPgfwCM=~F-m+JQ$r%A7N}0)UH4)!nDRs6@Vf0v%X?tdo9M8>y7vzCk+=8uG
zse`#;JK8Kr;7V%r^Xql+GE%anV-Z6rdmKgi*ZHLeU<h&L5KG|b8V~;{51s?H)6M2T
zh$!SQ=7UNo-*c&LRl-33zHO&$q2Go&5uR1Xzc4~GNyJ~q)y1$uB$~$DD<<*dV$c$Y
zn)pC5YzI>On2W38YfMlL<VJgMZ5)1C0`0IJA1H+dP{a?G!n;^Pbs6`YK>>64`(}7Q
zGhF3wGN2pw!h#t7`!?8J6dg6tRTk_Ij4uubLE}1<bB$j)47(LjfbWdM16a#jC*T=1
zCH1lgp)v+FqQxi{0d6Rl^ScB@P)w~HWT!gfwYV;V_?g^y)s>C-)l%ZuFmZOy&Z6ie
HY3Ke2P>fGM

delta 1594
zcmW-heNa<p7RKLmb8l`EzHT&$0R*m5gwzs4ElWUwNKpeQU#%Tfv|4P<in6dpR;9>$
zt#MGA;_NNF+oqUE22(<bajbh;Rt&?+w9~2Gc4t3k>Q09VX@{{hy9{=BThL@<|9Q@N
z=KSV4=dU9L6jDGDEC4z&?a{Zlir^toxt?3uGW&l^-o%|s77w#cpZ(U9cgYLK9;&h8
zM~HEYRFt9+$^-<8{WmD=Uz8hmdi<C+lz9ASb6c*S%o`N{{L{L+L_3QGs{hJ;W)wN~
zv}%U8h53=oMyviLVqLN$eMMN+4E|)q+QWPZ1^vd@V!mzRY3HQMM>(gg+&;q_V<@02
zxAA}Th-J%ZJ@Fka<9hnbjUhDQFP=37Z6RvHKWn&R4JA+bKMeDu{yy8-Fn@=?aBU2q
zE&lSE5P#=qurp-1^Av0ineKQKoBNXR*TZNcjxCSjTD-S79%-G9lYFo;R6gyW<*#fH
z)lB<D$KpNlf^$PCUKX6(`q0w7{$6K#D0<J=>#$CX3(L<^zo`;+D-~Njw|OIq+Tt1m
zVmP!GU$e~1Y$Nigc19TJAHVOA-&J^ShxN_SEE@>l<vgNurIPXJyEk~m2P>(xXY7?)
z@yC@-ndr4lETr_G|Bt>|7Uul%OTV7s?90oxFn5>sh}$3Yg_Y_|{M8gEkB1F$a(meP
z2fauC8m%(+h~43V5yo+O#{2@V(hCV;1-};m{-uK<_o<Rzkvz_V*G1`ZA?y<W{Wy!~
zlJNVeM{*>=%HCBO*a;~J4IV%0xp6k`#51j;=}9X5O0+#GfC};4lg8408a%KOA>iR^
z`}XU;HwCh(W5SztY?K^rns<T`q5gdA`YZWLF!<gY`&|4;Tz^1=eVO|;SS)A~HPOnX
z5|=<dDA^qnWUj-z#pBVOOv{u2{)Wj}su1!KqAXAp*8(U;h-|P-i8rDdP%Yk%R;1Q^
z@Scsb#)p+80gvSi&Z_t+z8%JU;xn;kDq~6Pj~z^|`*<if!IHosa{_6q6PIJh;M~Bg
zVB|XbMs%oG9+c;z59Fk}dcXyi()RiBbmWl-Sq^g9ty>3ASgsG56+tD2MFrWK_U(8E
zI-T5`%psgyRz^0h!9#P&(<yVPE`?aPd`Hv(n(Q?Zw?-c!hc5~S?<*G__4Q;^eF}D)
z;^Js%Ag7K#a-Tj*ssKuu_C9xGJ9!)63{x}jMzusm!N!K1h*0Wn%=tN@%-i#hyX?q<
z`_PdEQq;91$h^f}ORjxgOWww=rNQcsae?u^L)KwI{>SqI>os6<hKmRa?^!NFQq>Vb
z=}l8dr1KO!4{Wv;yVJ6@WJ(4n73PRw^;*mk@*E90T<gS$9i2uTYC{Y|R<)8}(vZ%z
zYVZ)MqkCx!I^kM{wB%hH3QP@=5d~_af5+qk%@E5Ak#Qx$aY%tK&^jH_b}qdaq&em=
znscSeA4&hC;VPAWV%}{&F;7l4E%-W`76!MR3i#e8?K@q*ww+Rth3_Gu^3m|Fmq(lP
zhv_Qmx)L6$S1W%A)OBCFW<@M(KnS(?OeMsd4*%lVNsCE_FDaC&)mT=f!sO~&h{&@i
zUko$tQf~&h)yyH6t9=i7b~CuydJT5x7!~9%n_&mvJ>_by)L<EwZ^*-9TjE<JX_sqI
zXB&5{<6WDRw4~4s-!NP6irb7NEguS%CgMOcUshQ}+Mf?|$q8_+6jN!V?mhIRw8ILR
zQmmgBD55q8r2FOY0NBlbq2iOo1nEWvq|=(`Zw}UGd>rUJ{_a5hRia@;p3_R-*r1Q0
z_T3~cHE>YAGaLV@W(WDA2251xWhq(%CxNkjA?kCawmN75Cd)O}-bm)^;eE&>T@A1e
zlB9_S_(4k@xJd$b&_Sm(YlolmR0rlSS<$4cTD4mGbP(RyqprO*vNslpE|<k(VDO#m
zxGn9Dz#BSHk?Cdl1awmG3jBjz{rb&ug!W?8gUXN=0qNFjrC-aan1W555Z1U;TgmA}
c>hH`iZu_=ar5BT^e<~G~huCcwLw()<2LfedTmS$7