Merge branch 'OverworldShuffleDev' into OverworldShuffle

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.7.0.1
+- Fixed buggy sprites in post-Aga Zora's Domain
+- Fixed L/R map switch when in special OW screens
+- Fixes issue not able to screen transition if bumped by enemy in water
+
 # 0.7.0.0
 - New OW Layout Shuffle Mode: Grid
 - Implemented Fog of War for Tile Flip

OverworldShuffle.py

@@ -8,7 +8,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
 from OverworldGlitchRules import create_owg_connections
 from Utils import bidict
 
-version_number = '0.7.0.0'
+version_number = '0.7.0.1'
 # branch indicator is intentionally different across branches
 version_branch = ''
 

Rom.py

@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '34c9d7b09fad982dea9e7c9e3ae885ee'
+RANDOMIZERBASEHASH = '01d81a1ad16b1838b27a057b8f8936d4'
 
 
 class JsonRom(object):

source/rom/DataTables.py

@@ -141,7 +141,7 @@ class DataTables:
         bytes = sum(1+len(x)*3 for x in self.ow_enemy_table.values() if len(x) > 0)+1
         self.pointer_addresses['ow_sprites'][1] = bytes
         # ending_byte = 0x09CB3B + bytes
-        max_per_state = {0: 0x40, 1: 0x90, 2: 0x81}  # dropped max on state 2 to steal space for extra sprites (Murahdahla, extra tutorial guard)
+        max_per_state = {0: 0x40, 1: 0x90, 2: 0x82}  # dropped max on state 2 to steal space for extra sprites (Murahdahla, extra tutorial guard)
 
         pointer_address = snes_to_pc(self.pointer_addresses['ow_sprites'][2][0])
         self.pointer_addresses['ow_sprites'][0] = pointer_address + ((max_per_state[0] + max_per_state[1] + max_per_state[2]) * 2)