Merge branch 'GwaaKiwi' into DungeonMap

InitialSram.py

@@ -72,7 +72,7 @@ class InitialSram:
         starting_magic = 0
 
         if world.flute_mode[player] == 'pseudo':
-            self._initial_sram_bytes[0x3C2] = 0x00
+            self._initial_sram_bytes[0x3C2] = 0xFF
             equip[0x34C] = 0x03
             equip[0x38C] = 0x01
 
@@ -119,9 +119,6 @@ class InitialSram:
             equip[0x37B] = 1
             starting_magic = 0x80
 
-        if startingstate.has('Ocarina (Activated)', player) or startingstate.has('Ocarina', player):
-            self._initial_sram_bytes[0x3C2] = 0xFF
-
         if world.mode[player] == 'standard' and world.logic[player] not in ['noglitches', 'minorglitches']:
             if startingstate.has('Ocarina (Activated)', player):
                 self.pre_set_overworld_flag(0x18, 0x20)

Rom.py

@@ -44,7 +44,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'c52bcbab18e5840e93a57c3e5430467c'
+RANDOMIZERBASEHASH = '9b4cee0b02c689b6201036789bb617a6'
 
 
 class JsonRom(object):