From 1a9cea452dec71d2a861aa648de8080010477bb8 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Thu, 28 May 2026 21:03:10 -0500
Subject: [PATCH] Zora/Bottle Vendor ask about item before taking money when
 hints are on

---
 OverworldGlitchRules.py |   4 ++--
 Rom.py                  |  11 ++++++++++-
 data/base2current.bps   | Bin 157838 -> 157832 bytes
 patches/2way_mirror.ips | Bin 0 -> 14 bytes
 patches/quiet_zora.ips  | Bin 0 -> 16 bytes
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 patches/2way_mirror.ips
 create mode 100644 patches/quiet_zora.ips

diff --git a/OverworldGlitchRules.py b/OverworldGlitchRules.py
index c01a53bc..8daa41cf 100644
--- a/OverworldGlitchRules.py
+++ b/OverworldGlitchRules.py
@@ -509,7 +509,7 @@ boots_clips = [
 
 mirror_clips_local = [
     ('Desert East Mirror Clip', 'Mire Area', 'Desert Mouth'),
-    ('EDDM Mirror Clip', 'East Dark Death Mountain (Bottom Left)', 'East Dark Death Mountain (Bottom)'),
+    ('EDDM Bridge Mirror Clip', 'East Dark Death Mountain (Bottom Left)', 'East Dark Death Mountain (Bottom)'),
     ('EDDM Mirror Clip', 'East Dark Death Mountain (Top)', 'Dark Death Mountain Ledge')
 ]
 
@@ -520,4 +520,4 @@ mirror_clips = [
 mirror_offsets = [
     (['DM Offset Mirror', 'DDM Offset Mirror'], ['West Death Mountain (Bottom)', 'West Dark Death Mountain (Bottom)'], ['Hyrule Castle Courtyard Northeast', 'Pyramid Crack'], ['Pyramid Area', 'Hyrule Castle Courtyard']),
     (['DM To HC Ledge Offset Mirror', 'DDM To Pyramid Offset Mirror'], ['West Death Mountain (Bottom)', 'West Dark Death Mountain (Bottom)'], ['Hyrule Castle Ledge', 'Pyramid Area'], ['Pyramid Area', 'Hyrule Castle Area'])
-]
\ No newline at end of file
+]
diff --git a/Rom.py b/Rom.py
index 3224d281..6d1c87c7 100644
--- a/Rom.py
+++ b/Rom.py
@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'e6d4fd01beef37b55e26d7c4479624d3'
+RANDOMIZERBASEHASH = '5c4c3cbe6d3fee849e66d4ac4a059792'
 
 
 class JsonRom(object):
@@ -2485,6 +2485,15 @@ def write_strings(rom, world, player, team, is_mystery=False):
 
     # For hints, first we write hints about entrances, some from the inconvenient list others from all reasonable entrances.
     if world.hints[player]:
+        zoraitem = world.get_location('King Zora', player).item.hint_text
+        if len(zoraitem) <= 15:
+            tt['zora_meeting'] = f"Whaddaya want?\n  ≥ {zoraitem.title()}\n    Nothin'{{CHOICE}}"
+        else:
+            tt['zora_meeting'] = f"Do you want {zoraitem}?\n  ≥ I'll pay\n    No thanks{{CHOICE}}"
+
+        bottleitem = world.get_location('Bottle Merchant', player).item.hint_text
+        tt['bottle_vendor_choice'] = f"Do you want {bottleitem}?\n  ≥ I'll take it\n    No thanks!\n{{CHOICE}}"
+
         tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
         hint_locations = HintLocations.copy()
         random.shuffle(hint_locations)
diff --git a/data/base2current.bps b/data/base2current.bps
index 3e1bc0d7580b65c718ea8b3bae6189635dff9bd8..14ff761359a43f387a1ef70545c95db2549d6463 100644
GIT binary patch
delta 56
zcmeCX$k}m`b3+d^b7e<cb3gO;erCp0MYh#F+qX{dna-%nsK#X0*sh_<xLre)DbAVW
MTDODm)C!9<0A6Dg{{R30

delta 62
zcmeCU$k}(1b3+d^b9F~cb3gO;erCp0Mc(N>jSQO$8YU|@PFHH2{!4{Xjd4M{k}BhN
SB~_+4XAY6{h*>Y<(}Dr+O%|X4

diff --git a/patches/2way_mirror.ips b/patches/2way_mirror.ips
new file mode 100644
index 0000000000000000000000000000000000000000..6e908386ff2134190b347a5202471a3072fede89
GIT binary patch
literal 14
VcmWG=3~}~gUg^xh*x>5#1^^sP1G@kK

literal 0
HcmV?d00001

diff --git a/patches/quiet_zora.ips b/patches/quiet_zora.ips
new file mode 100644
index 0000000000000000000000000000000000000000..3e5a6364424255fb30e063045a1d1c0b22e19669
GIT binary patch
literal 16
XcmWG=3~}~g)Z5L#z`*><)!z*OA`%25

literal 0
HcmV?d00001