From 4b5903940f18a20b69620f3741760fd19ac3876f Mon Sep 17 00:00:00 2001
From: Anthony Stewart <anthony.l.stewart@outlook.com>
Date: Thu, 20 Mar 2025 20:31:31 -0500
Subject: [PATCH] Don't unset Zelda's Letter.

---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 7 -------
 soh/soh/Enhancements/randomizer/logic.cpp         | 8 ++++----
 soh/soh/Enhancements/randomizer/savefile.cpp      | 1 -
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index bbcff2053..d8a7bd7a7 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1615,13 +1615,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             }
             break;
         }
-        case VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER: {
-            if (*should) {
-                //remove zelda's letter as this is the only use for it
-                Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
-            }
-            break;
-        }
         case VB_FREEZE_ON_SKULL_TOKEN:
         case VB_TRADE_TIMER_ODD_MUSHROOM:
         case VB_TRADE_TIMER_FROG:
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index d1c46d740..b45dc0418 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1346,8 +1346,8 @@ namespace Rando {
     };
 
     std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
-        { RG_ZELDAS_LETTER,          RAND_INF_ZELDAS_LETTER },
-        { RG_WEIRD_EGG,              RAND_INF_WEIRD_EGG },
+        { RG_ZELDAS_LETTER,          RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA },
+        { RG_WEIRD_EGG,              RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG },
         { RG_GOHMA_SOUL,             RAND_INF_GOHMA_SOUL },
         { RG_KING_DODONGO_SOUL,      RAND_INF_KING_DODONGO_SOUL },
         { RG_BARINADE_SOUL,          RAND_INF_BARINADE_SOUL },
@@ -1497,10 +1497,10 @@ namespace Rando {
                 SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
                 break;
             case RG_WEIRD_EGG:
-                SetRandoInf(RAND_INF_WEIRD_EGG, state);
+                SetRandoInf(RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG, state);
                 break;
             case RG_ZELDAS_LETTER:
-                SetRandoInf(RAND_INF_ZELDAS_LETTER, state);
+                SetRandoInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA, state);
                 break;
             case RG_DOUBLE_DEFENSE:
                 mSaveContext->isDoubleDefenseAcquired = state;
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 1c3a6a9cc..2881bcd84 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -371,7 +371,6 @@ extern "C" void Randomizer_InitSaveFile() {
 
     if (Randomizer_GetSettingValue(RSK_KAK_GATE) == RO_KAK_GATE_OPEN) {
         Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
-        Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
     }
 
     if (Randomizer_GetSettingValue(RSK_GERUDO_FORTRESS) == RO_GF_CARPENTERS_FAST ||