Minor reorganization of code/data placement

BaseClasses.py

@@ -1559,10 +1559,10 @@ class OWEdge(object):
 
     def getAddress(self):
         base_address = {
-            Direction.North: 0x153800,
+            Direction.North: 0x152800,
-            Direction.South: 0x153800 + (0x42 * 16),
+            Direction.South: 0x152800 + (0x42 * 16),
-            Direction.West: 0x153800 + (0x84 * 16),
+            Direction.West: 0x152800 + (0x84 * 16),
-            Direction.East: 0x153800 + (0xcf * 16),
+            Direction.East: 0x152800 + (0xcf * 16),
         }
         return base_address[self.direction] + (self.edge_id * 16)
 

Rom.py

@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '081bd865c18f390a369248797fedd2d4'
+RANDOMIZERBASEHASH = '287a85bc8ba1815c2e9b41d0cd79b869'
 
 
 class JsonRom(object):

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