From 8ebbff3e7d19d29565615ecfbcd5642d16df9d70 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 2 Jan 2025 05:17:26 -0600
Subject: [PATCH] Allow flute in rain state for glitched modes with starting
 preactivated flute

---
 InitialSram.py        |   5 +++++
 Rom.py                |   2 +-
 data/base2current.bps | Bin 133996 -> 133996 bytes
 3 files changed, 6 insertions(+), 1 deletion(-)

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 30a30355cec10c78c85615ae6f4c6f967a314bc2..b871a6ba4cdf189e748d36b3ee87b0607da4afe8 100644
GIT binary patch
delta 41
zcmV+^0M`HPmI&;Y2(Tan1lH3jEVCp7==TGd@_vI4`?nAK0aXwP5wJh`oO}uigb5Lj

delta 41
zcmV+^0M`HPmI&;Y2(Tan1e(-kE3+g6==TE>g0O=R`?nAK0aXwPdS+n@;UqPgape%j