diff --git a/InitialSram.py b/InitialSram.py
index 001c9f9d..8d1685fc 100644
--- a/InitialSram.py
+++ b/InitialSram.py
@@ -114,6 +114,11 @@ class InitialSram:
             equip[0x37B] = 1
             starting_magic = 0x80
 
+        if world.mode[player] == 'standard' and world.logic[player] not in ['noglitches', 'minorglitches']:
+            if (startingstate.has('Ocarina', player) and world.flute_mode[player] == 'active') \
+                    or startingstate.has('Ocarina (Activated)', player):
+                self.pre_set_overworld_flag(0x18, 0x20)
+
         if startingstate.has('Return Old Man', player):
             self._initial_sram_bytes[0x410] |= 0x01
 
diff --git a/Rom.py b/Rom.py
index 67369cfa..c39c3f58 100644
--- a/Rom.py
+++ b/Rom.py
@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'e2e7241bfb0085ab7ba12167565e814a'
+RANDOMIZERBASEHASH = '05a99da65a85d2093f1824a82a876fab'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 30a30355..b871a6ba 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ